Bluetooth: Fix regression in L2CAP connection procedure
Caused by the following commit, partially revert it. commit9fa7e4f76f
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 thedf3c3931e
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>
This commit is contained in:
parent
f3dc158637
commit
9191e6ad89
|
@ -2323,8 +2323,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr
|
|||
|
||||
sk = chan->sk;
|
||||
|
||||
if ((bt_sk(sk)->defer_setup && sk->sk_state != BT_CONNECT2) ||
|
||||
(!bt_sk(sk)->defer_setup && sk->sk_state != BT_CONFIG)) {
|
||||
if (sk->sk_state != BT_CONFIG && sk->sk_state != BT_CONNECT2) {
|
||||
struct l2cap_cmd_rej rej;
|
||||
|
||||
rej.reason = cpu_to_le16(0x0002);
|
||||
|
|
Loading…
Reference in a new issue