aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2011-04-14 17:57:26 -0300
committerGustavo F. Padovan <padovan@profusion.mobi>2011-04-14 18:36:16 -0300
commit26954c7f26068b6ced108806fdd39aee5cd54e6f (patch)
treef47086fa11a82b9839c63269f41e517b4a7c6ecf /net/bluetooth
parentBluetooth: Fix another locking unbalance (diff)
downloadlinux-dev-26954c7f26068b6ced108806fdd39aee5cd54e6f.tar.xz
linux-dev-26954c7f26068b6ced108806fdd39aee5cd54e6f.zip
Bluetooth: Fix lockdep warning in L2CAP
Fix a regression from the L2CAP "rewrite" patches. Purge the tx_q already happens on l2cap_chan_del() so we don't need it at l2cap_disconnect_req(). Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/l2cap_core.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index bc84ed1b3320..d47de2b04b2e 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -477,8 +477,6 @@ void l2cap_send_disconn_req(struct l2cap_conn *conn, struct l2cap_chan *chan, in
sk = chan->sk;
- skb_queue_purge(&chan->tx_q);
-
if (l2cap_pi(sk)->mode == L2CAP_MODE_ERTM) {
del_timer(&chan->retrans_timer);
del_timer(&chan->monitor_timer);