diff options
author | Vinicius Costa Gomes <vinicius.gomes@openbossa.org> | 2011-06-17 21:46:26 -0400 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-06-20 15:32:04 -0400 |
commit | 6312845169e8719f6f0726efc62bc6a8dedea9d3 (patch) | |
tree | 6a1bc84b26e9f581dec8baee9bab4d084239aef8 /net | |
parent | a7925bd27d6ef020b8f3a3a64bde61d0add07220 (diff) |
Bluetooth: Fix crash when setting a LE socket to ready
We should not try to do any other type of configuration for
LE links when they become ready.
Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/l2cap_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 25f31f4c7d0..b8c1df2035e 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c | |||
@@ -918,11 +918,11 @@ static void l2cap_conn_ready(struct l2cap_conn *conn) | |||
918 | 918 | ||
919 | bh_lock_sock(sk); | 919 | bh_lock_sock(sk); |
920 | 920 | ||
921 | if (conn->hcon->type == LE_LINK) | 921 | if (conn->hcon->type == LE_LINK) { |
922 | if (smp_conn_security(conn, chan->sec_level)) | 922 | if (smp_conn_security(conn, chan->sec_level)) |
923 | l2cap_chan_ready(sk); | 923 | l2cap_chan_ready(sk); |
924 | 924 | ||
925 | if (chan->chan_type != L2CAP_CHAN_CONN_ORIENTED) { | 925 | } else if (chan->chan_type != L2CAP_CHAN_CONN_ORIENTED) { |
926 | __clear_chan_timer(chan); | 926 | __clear_chan_timer(chan); |
927 | l2cap_state_change(chan, BT_CONNECTED); | 927 | l2cap_state_change(chan, BT_CONNECTED); |
928 | sk->sk_state_change(sk); | 928 | sk->sk_state_change(sk); |