diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2012-07-10 09:40:26 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2012-07-10 09:40:26 +0000 |
| commit | b0bc89b175be423fa0d76a862098676bd3303d26 (patch) | |
| tree | 09abba35c9debb56987e816537142ba49ba22b57 /sys/kern | |
| parent | 4002041a3851c90f39e2583f12e2caca85d95677 (diff) | |
Try to cleanup the macro magic because of socket spliceing. Since struct
socket is no longer affected by option SOCKET_SPLICE we can simplyfy the
code. OK bluhm@
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/uipc_socket.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 8f2be3a7261..10b1fa202b0 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket.c,v 1.101 2012/07/07 18:48:19 bluhm Exp $ */ +/* $OpenBSD: uipc_socket.c,v 1.102 2012/07/10 09:40:25 claudio Exp $ */ /* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */ /* @@ -1268,16 +1268,14 @@ somove(struct socket *so, int wait) if (o) { error = (*sosp->so_proto->pr_usrreq)(sosp, PRU_SEND, m, NULL, NULL, NULL); - m = NULL; + m = o; if (error) { - m_freem(o); if (sosp->so_state & SS_CANTSENDMORE) error = EPIPE; goto release; } len -= oobmark; so->so_splicelen += oobmark; - m = o; o = m_get(wait, MT_DATA); } oobmark = 0; @@ -1333,25 +1331,33 @@ somove(struct socket *so, int wait) timeout_add_tv(&so->so_idleto, &so->so_idletv); return (1); } +#endif /* SOCKET_SPLICE */ void sorwakeup(struct socket *so) { +#ifdef SOCKET_SPLICE if (so->so_rcv.sb_flags & SB_SPLICE) { (void) somove(so, M_DONTWAIT); return; } - _sorwakeup(so); +#endif + sowakeup(so, &so->so_rcv); + if (so->so_upcall) + (*(so->so_upcall))(so, so->so_upcallarg, M_DONTWAIT); } void sowwakeup(struct socket *so) { +#ifdef SOCKET_SPLICE if (so->so_snd.sb_flags & SB_SPLICE) (void) somove(so->so_spliceback, M_DONTWAIT); - _sowwakeup(so); +#endif + sowakeup(so, &so->so_snd); } +#ifdef SOCKET_SPLICE void soidle(void *arg) { |