aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2013-04-26 14:57:30 +0300
committerJohan Hedberg <johan.hedberg@intel.com>2013-04-26 14:57:30 +0300
commit30f3e3c4cbb7eb5864f1c022243baae82f59352d (patch)
tree00ffb67c8ba639bf715f5e84056c1d84180f3628
parent1d3cdfb1a8abfe87054400220bb4317551dbae91 (diff)
downloadbluetooth-next-30f3e3c4cbb7eb5864f1c022243baae82f59352d.tar.gz
Bluetooth: Fix duplicate call to l2cap_chan_ready()
In l2cap_le_conn_ready() after doing l2cap_chann_add() the LE channel is part of the list which is subsequently iterated in l2cap_conn_ready() in this loop each channel will get l2cap_chan_ready() called which would result in trying to set the channel two times into BT_CONNECTED state. Instead it makes sense to just add the channel but not call chan_ready in l2cap_le_conn_ready, which is what this patch does. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
-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 e95a0a6cc4676a..e954855ea27a71 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1371,8 +1371,6 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn)
l2cap_chan_add(conn, chan);
- l2cap_chan_ready(chan);
-
clean:
release_sock(parent);
}