]> Pileus Git - ~andy/linux/commitdiff
Bluetooth: Use l2cap_chan_ready() in LE path
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>
Fri, 25 May 2012 12:30:56 +0000 (09:30 -0300)
committerJohan Hedberg <johan.hedberg@intel.com>
Tue, 5 Jun 2012 03:34:10 +0000 (06:34 +0300)
This replace code in l2cap_le_conn_ready() by a similar code in
l2cap_chan_ready().

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/l2cap_core.c

index 0d556f7faaf66324d526c09459d800a066237918..de0dc9ec9862ee87ba0f22f142a3a63dee5b3e3b 100644 (file)
@@ -1228,10 +1228,7 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn)
 
        l2cap_chan_add(conn, chan);
 
-       __set_chan_timer(chan, sk->sk_sndtimeo);
-
-       __l2cap_state_change(chan, BT_CONNECTED);
-       parent->sk_data_ready(parent, 0);
+       l2cap_chan_ready(chan);
 
 clean:
        release_sock(parent);