Bluetooth: Fix regression in L2CAP connection procedure
authorGustavo F. Padovan <padovan@profusion.mobi>
Fri, 15 Jul 2011 18:30:20 +0000 (18:30 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 16 Jul 2011 17:14:44 +0000 (10:14 -0700)
commit9191e6ad897a8b4f0b89aea7c2d3c843f29a8630
treeef5f1c3795db584b7ff7780ac915aa7b0bdce057
parentf3dc1586375c3fa061c4867e8b076d09a53beb03
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