projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
62f3a2c
)
Bluetooth: Fix lockdep warning in L2CAP
author
Gustavo F. Padovan
<padovan@profusion.mobi>
Thu, 14 Apr 2011 20:57:26 +0000
(17:57 -0300)
committer
Gustavo F. Padovan
<padovan@profusion.mobi>
Thu, 14 Apr 2011 21:36:16 +0000
(18:36 -0300)
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>
net/bluetooth/l2cap_core.c
patch
|
blob
|
history
diff --git
a/net/bluetooth/l2cap_core.c
b/net/bluetooth/l2cap_core.c
index
bc84ed1
..
d47de2b
100644
(file)
--- 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);