33c33
< __FBSDID("$FreeBSD: head/sys/kern/uipc_sockbuf.c 191366 2009-04-21 19:14:13Z emax $");
---
> __FBSDID("$FreeBSD: head/sys/kern/uipc_sockbuf.c 193272 2009-06-01 21:17:03Z jhb $");
177a178
> int ret;
188a190,200
> if (sb->sb_upcall != NULL) {
> ret = sb->sb_upcall(so, sb->sb_upcallarg, M_DONTWAIT);
> if (ret == SU_ISCONNECTED) {
> KASSERT(sb == &so->so_rcv,
> ("SO_SND upcall returned SU_ISCONNECTED"));
> soupcall_clear(so, SO_RCV);
> }
> } else
> ret = SU_OK;
> if (sb->sb_flags & SB_AIO)
> aio_swake(so, sb);
189a202,203
> if (ret == SU_ISCONNECTED)
> soisconnected(so);
192,195d205
< if (sb->sb_flags & SB_UPCALL)
< (*so->so_upcall)(so, so->so_upcallarg, M_DONTWAIT);
< if (sb->sb_flags & SB_AIO)
< aio_swake(so, sb);