]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Bluetooth: Fix duplicate call to l2cap_chan_ready()
authorJohan Hedberg <johan.hedberg@intel.com>
Mon, 29 Apr 2013 16:35:40 +0000 (19:35 +0300)
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>
Fri, 3 May 2013 19:09:43 +0000 (16:09 -0300)
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>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
net/bluetooth/l2cap_core.c

index 936ce23c3a20c7ad2caf71d9c919e327fe5ca5ca..e88cbc53ace41b966fbcec52a66820dafe9664a0 100644 (file)
@@ -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);
 }