aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2011-04-14 16:57:26 -0400
committerGustavo F. Padovan <padovan@profusion.mobi>2011-04-14 17:36:16 -0400
commit26954c7f26068b6ced108806fdd39aee5cd54e6f (patch)
treef47086fa11a82b9839c63269f41e517b4a7c6ecf
parent62f3a2cfb1891c070631e496eeea852e949ea8bb (diff)
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>
-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
477 477
478 sk = chan->sk; 478 sk = chan->sk;
479 479
480 skb_queue_purge(&chan->tx_q);
481
482 if (l2cap_pi(sk)->mode == L2CAP_MODE_ERTM) { 480 if (l2cap_pi(sk)->mode == L2CAP_MODE_ERTM) {
483 del_timer(&chan->retrans_timer); 481 del_timer(&chan->retrans_timer);
484 del_timer(&chan->monitor_timer); 482 del_timer(&chan->monitor_timer);