30c30
< __FBSDID("$FreeBSD: head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c 183292 2008-09-23 03:16:54Z kmacy $");
---
> __FBSDID("$FreeBSD: head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c 193272 2009-06-01 21:17:03Z jhb $");
144c144
< static void iwch_so_upcall(struct socket *so, void *arg, int waitflag);
---
> static int iwch_so_upcall(struct socket *so, void *arg, int waitflag);
338,340c338
< epc->so->so_upcall = NULL;
< epc->so->so_upcallarg = NULL;
< epc->so->so_rcv.sb_flags &= ~SB_UPCALL;
---
> soupcall_clear(epc->so, SO_RCV);
1111c1109
< struct iwch_ep *ep = so->so_upcallarg;
---
> struct iwch_ep *ep = so->so_rcv.sb_upcallarg;
1132c1130
< ep = so->so_upcallarg;
---
> ep = so->so_rcv.sb_upcallarg;
1312,1314c1310,1311
< epc->so->so_upcall = iwch_so_upcall;
< epc->so->so_upcallarg = epc;
< epc->so->so_rcv.sb_flags |= SB_UPCALL;
---
> SOCK_LOCK(epc->so);
> soupcall_set(epc->so, SO_RCV, iwch_so_upcall, epc);
1315a1313
> SOCK_UNLOCK(epc->so);
1614c1612
< so->so_rcv.sb_flags |= SB_UPCALL;
---
> soupcall_set(so, SO_RCV, iwch_so_upcall, child_ep);
1616,1617d1613
< so->so_upcall = iwch_so_upcall;
< so->so_upcallarg = child_ep;
1664c1660
< static void
---
> static int
1676a1673
> return (SU_OK);