diff options
| author | Vinicius Costa Gomes <vinicius.gomes@openbossa.org> | 2011-06-17 22:46:26 -0300 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-06-20 16:32:04 -0300 |
| commit | 6312845169e8719f6f0726efc62bc6a8dedea9d3 (patch) | |
| tree | 6a1bc84b26e9f581dec8baee9bab4d084239aef8 /net/bluetooth | |
| parent | a7925bd27d6ef020b8f3a3a64bde61d0add07220 (diff) | |
| download | lwn-6312845169e8719f6f0726efc62bc6a8dedea9d3.tar.gz lwn-6312845169e8719f6f0726efc62bc6a8dedea9d3.zip | |
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/bluetooth')
| -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 25f31f4c7d08..b8c1df2035ec 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) bh_lock_sock(sk); - if (conn->hcon->type == LE_LINK) + if (conn->hcon->type == LE_LINK) { if (smp_conn_security(conn, chan->sec_level)) l2cap_chan_ready(sk); - if (chan->chan_type != L2CAP_CHAN_CONN_ORIENTED) { + } else if (chan->chan_type != L2CAP_CHAN_CONN_ORIENTED) { __clear_chan_timer(chan); l2cap_state_change(chan, BT_CONNECTED); sk->sk_state_change(sk); |