diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-07-15 18:30:20 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-16 10:14:44 -0700 |
| commit | 9191e6ad897a8b4f0b89aea7c2d3c843f29a8630 (patch) | |
| tree | ef5f1c3795db584b7ff7780ac915aa7b0bdce057 | |
| parent | f3dc1586375c3fa061c4867e8b076d09a53beb03 (diff) | |
| download | linux-9191e6ad897a8b4f0b89aea7c2d3c843f29a8630.tar.gz linux-9191e6ad897a8b4f0b89aea7c2d3c843f29a8630.tar.bz2 linux-9191e6ad897a8b4f0b89aea7c2d3c843f29a8630.zip | |
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>
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index ebff14c69078..4fbf67eda239 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -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); |