From 081dc461f19da3f76968f634f271dd22cafeb28c Mon Sep 17 00:00:00 2001 From: rwatson Date: Fri, 18 Jun 2004 05:09:42 +0000 Subject: [PATCH] Correct merge-o: make sure to unlock symmetrically socket buffer locks on bluetooth sockets when clearing upcall flags. Submitted by: emax --- sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c | 4 ++-- 1 file 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 c4c29a34eefa..a81afac7c378 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);