diff options
| author | rwatson <rwatson@FreeBSD.org> | 2004-06-18 05:09:42 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2004-06-18 05:09:42 +0000 |
| commit | 081dc461f19da3f76968f634f271dd22cafeb28c (patch) | |
| tree | 4f4b9307abaf8a56b5ec0b161042d66a85d80fb8 /sys/netgraph/bluetooth/socket | |
| parent | ec77b48150ed60621c9be4a28b7d3bd44460d17c (diff) | |
| download | FreeBSD-src-081dc461f19da3f76968f634f271dd22cafeb28c.zip FreeBSD-src-081dc461f19da3f76968f634f271dd22cafeb28c.tar.gz | |
Correct merge-o: make sure to unlock symmetrically socket buffer
locks on bluetooth sockets when clearing upcall flags.
Submitted by: emax
Diffstat (limited to 'sys/netgraph/bluetooth/socket')
| -rw-r--r-- | sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c index c4c29a3..a81afac 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c @@ -1327,10 +1327,10 @@ bad: l2so->so_upcall = NULL; SOCKBUF_LOCK(&l2so->so_rcv); l2so->so_rcv.sb_flags &= ~SB_UPCALL; - SOCKBUF_LOCK(&l2so->so_rcv); + SOCKBUF_UNLOCK(&l2so->so_rcv); SOCKBUF_LOCK(&l2so->so_snd); l2so->so_snd.sb_flags &= ~SB_UPCALL; - SOCKBUF_LOCK(&l2so->so_snd); + SOCKBUF_UNLOCK(&l2so->so_snd); l2so->so_state &= ~SS_NBIO; mtx_destroy(&s->session_mtx); |
