Bluetooth: Fix regression in L2CAP connection procedure
authorGustavo F. Padovan <padovan@profusion.mobi>
Fri, 15 Jul 2011 18:30:20 +0000 (18:30 +0000)
committerJaikumar Ganesh <jaikumar@google.com>
Mon, 18 Jul 2011 19:28:03 +0000 (12:28 -0700)
commit8ee057f096a2fe0b45b7b5ebb0279556d896f018
tree5044d7ebd3f61c50e69de21cad2be73ba1a31e96
parent1be668d732e91d7a83529b0e2946c0343c1df6be
Bluetooth: Fix regression in L2CAP connection procedure

Caused by the following commit, partially revert it.

commit 9fa7e4f76f3658ba1f44fbdb95c77e7df3f53f95
Author: Gustavo F. Padovan <padovan@profusion.mobi>
Date:   Thu Jun 30 16:11:30 2011 -0300

    Bluetooth: Fix regression with incoming L2CAP connections

    PTS test A2DP/SRC/SRC_SET/TC_SRC_SET_BV_02_I revealed that
    ( probably after the df3c3931e commit ) the l2cap connection
    could not be established in case when the "Auth Complete" HCI
    event does not arive before the initiator send "Configuration
    request", in which case l2cap replies with "Command rejected"
    since the channel is still in BT_CONNECT2 state.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/bluetooth/l2cap_core.c