summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2018-01-04 10:45:31 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2018-01-04 10:45:31 +0000
commit81928512907724b267014ddcb66efc4d76414304 (patch)
tree01bf62f3a3676ee9666ef16eb3ba08b48084e323
parent1153967520b975fb47672c7ecd453af52b991bab (diff)
Unifdef snd/rcv.
ok visa@, claudio@
-rw-r--r--sys/kern/uipc_usrreq.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 5f0d7f23bb3..21dd72def41 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_usrreq.c,v 1.122 2017/12/19 09:35:56 mpi Exp $ */
+/* $OpenBSD: uipc_usrreq.c,v 1.123 2018/01/04 10:45:30 mpi Exp $ */
/* $NetBSD: uipc_usrreq.c,v 1.18 1996/02/09 19:00:50 christos Exp $ */
/*
@@ -170,8 +170,6 @@ uipc_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
case SOCK_STREAM:
case SOCK_SEQPACKET:
-#define rcv (&so->so_rcv)
-#define snd (&so2->so_snd)
if (unp->unp_conn == NULL)
break;
so2 = unp->unp_conn->unp_socket;
@@ -179,11 +177,9 @@ uipc_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
* Adjust backpressure on sender
* and wakeup any waiting to write.
*/
- snd->sb_mbcnt = rcv->sb_mbcnt;
- snd->sb_cc = rcv->sb_cc;
+ so2->so_snd.sb_mbcnt = so->so_rcv.sb_mbcnt;
+ so2->so_snd.sb_cc = so->so_rcv.sb_cc;
sowwakeup(so2);
-#undef snd
-#undef rcv
break;
default: