aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/l2cap_core.c
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-05-25 08:30:56 -0400
committerJohan Hedberg <johan.hedberg@intel.com>2012-06-04 23:34:10 -0400
commit6754e0df133b088aa97ae6f2d3fd5377e43d1fc6 (patch)
treed37146e88c2b8878cb0dcee426626ec5cfae075c /net/bluetooth/l2cap_core.c
parent2f84a2e6a6978810b06b5f33892152183f1dace9 (diff)
Bluetooth: Use l2cap_chan_ready() in LE path
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>
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
-rw-r--r--net/bluetooth/l2cap_core.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 0d556f7faaf6..de0dc9ec9862 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1228,10 +1228,7 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn)
1228 1228
1229 l2cap_chan_add(conn, chan); 1229 l2cap_chan_add(conn, chan);
1230 1230
1231 __set_chan_timer(chan, sk->sk_sndtimeo); 1231 l2cap_chan_ready(chan);
1232
1233 __l2cap_state_change(chan, BT_CONNECTED);
1234 parent->sk_data_ready(parent, 0);
1235 1232
1236clean: 1233clean:
1237 release_sock(parent); 1234 release_sock(parent);