These defines do not help, they'll make further changes more complicated to understand, so I'd like to remove them. ok?
Index: kern/uipc_usrreq.c =================================================================== RCS file: /cvs/src/sys/kern/uipc_usrreq.c,v retrieving revision 1.122 diff -u -p -r1.122 uipc_usrreq.c --- kern/uipc_usrreq.c 19 Dec 2017 09:35:56 -0000 1.122 +++ kern/uipc_usrreq.c 3 Jan 2018 14:43:59 -0000 @@ -170,8 +170,6 @@ uipc_usrreq(struct socket *so, int req, 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, * 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: