diff options
author | Gustavo F. Padovan <padovan@profusion.mobi> | 2010-09-08 13:59:44 -0400 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2010-09-30 11:19:35 -0400 |
commit | b0239c80fe89d5832a68a0f3121a9d5ec9fb763e (patch) | |
tree | e4d6731033163bb1fc990bf3b0c5bbf7924b21cd /net | |
parent | fad003b6c8e3d944d4453fd569b0702ef1af82b3 (diff) |
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>
Diffstat (limited to 'net')
-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 | |||
3089 | if (!sk) | 3089 | if (!sk) |
3090 | return -ENOENT; | 3090 | return -ENOENT; |
3091 | 3091 | ||
3092 | if (sk->sk_state != BT_CONFIG) { | 3092 | if (sk->sk_state == BT_DISCONN) |
3093 | struct l2cap_cmd_rej rej; | ||
3094 | |||
3095 | rej.reason = cpu_to_le16(0x0002); | ||
3096 | l2cap_send_cmd(conn, cmd->ident, L2CAP_COMMAND_REJ, | ||
3097 | sizeof(rej), &rej); | ||
3098 | goto unlock; | 3093 | goto unlock; |
3099 | } | ||
3100 | 3094 | ||
3101 | /* Reject if config buffer is too small. */ | 3095 | /* Reject if config buffer is too small. */ |
3102 | len = cmd_len - sizeof(*req); | 3096 | len = cmd_len - sizeof(*req); |