From: Vinicius Costa Gomes Date: Sat, 18 Jun 2011 01:46:26 +0000 (-0300) Subject: Bluetooth: Fix crash when setting a LE socket to ready X-Git-Tag: MMI-PSA29.97-13-9~18350^2~12^2~42^2~389^2~3 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6312845169e8719f6f0726efc62bc6a8dedea9d3;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: Gustavo F. Padovan --- 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);