diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2010-09-08 19:59:44 +0200 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2010-09-30 17:19:35 +0200 |
| commit | b0239c80fe89d5832a68a0f3121a9d5ec9fb763e (patch) | |
| tree | e4d6731033163bb1fc990bf3b0c5bbf7924b21cd | |
| parent | Bluetooth: Fix inconsistent lock state with RFCOMM (diff) | |
| download | linux-b0239c80fe89d5832a68a0f3121a9d5ec9fb763e.tar.xz linux-b0239c80fe89d5832a68a0f3121a9d5ec9fb763e.zip | |
Revert "Bluetooth: Don't accept ConfigReq if we aren't in the BT_CONFIG state"
This reverts commit 8cb8e6f1684be13b51f8429b15f39c140326b327.
That commit introduced a regression with the Bluetooth Profile Tuning
Suite(PTS), Reverting this make sure that L2CAP is in a qualificable
state.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
| -rw-r--r-- | net/bluetooth/l2cap.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index f2062aace406..44a8fb0d6c29 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c @@ -3089,14 +3089,8 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr if (!sk) return -ENOENT; - if (sk->sk_state != BT_CONFIG) { - struct l2cap_cmd_rej rej; - - rej.reason = cpu_to_le16(0x0002); - l2cap_send_cmd(conn, cmd->ident, L2CAP_COMMAND_REJ, - sizeof(rej), &rej); + if (sk->sk_state == BT_DISCONN) goto unlock; - } /* Reject if config buffer is too small. */ len = cmd_len - sizeof(*req); |