Bluetooth: Fix regression in L2CAP connection procedure
authorGustavo F. Padovan <padovan@profusion.mobi>
Fri, 15 Jul 2011 18:30:20 +0000 (18:30 +0000)
committermgross <mark.gross@intel.com>
Wed, 9 Nov 2011 20:21:24 +0000 (12:21 -0800)
commit0f3219b75653564a66268d4250069e5605bb87e3
tree632723b57fc7f6edd99bea8b48a2548770b66773
parentd9d53d39f38a4eda3cf9ceec38d2cea996561a0f
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