Deleted Added
full compact
31c31
< * $FreeBSD: head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c 188452 2009-02-10 20:27:05Z emax $
---
> * $FreeBSD: head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c 193272 2009-06-01 21:17:03Z jhb $
96c96
< static void ng_btsocket_rfcomm_upcall
---
> static int ng_btsocket_rfcomm_upcall
1010c1010
< static void
---
> static int
1020a1021
> return (SU_OK);
1050,1051d1050
< s->l2so->so_upcallarg = NULL;
< s->l2so->so_upcall = NULL;
1053c1052
< s->l2so->so_rcv.sb_flags &= ~SB_UPCALL;
---
> soupcall_clear(s->l2so, SO_RCV);
1056c1055
< s->l2so->so_snd.sb_flags &= ~SB_UPCALL;
---
> soupcall_clear(s->l2so, SO_SND);
1289,1290d1287
< l2so->so_upcallarg = NULL;
< l2so->so_upcall = ng_btsocket_rfcomm_upcall;
1292c1289
< l2so->so_rcv.sb_flags |= SB_UPCALL;
---
> soupcall_set(l2so, SO_RCV, ng_btsocket_rfcomm_upcall, NULL);
1295c1292
< l2so->so_snd.sb_flags |= SB_UPCALL;
---
> soupcall_set(l2so, SO_SND, ng_btsocket_rfcomm_upcall, NULL);
1373,1374d1369
< l2so->so_upcallarg = NULL;
< l2so->so_upcall = NULL;
1376c1371
< l2so->so_rcv.sb_flags &= ~SB_UPCALL;
---
> soupcall_clear(s->l2so, SO_RCV);
1379c1374
< l2so->so_snd.sb_flags &= ~SB_UPCALL;
---
> soupcall_clear(s->l2so, SO_SND);