Revert "Bluetooth: Don't accept ConfigReq if we aren't in the BT_CONFIG state"
This reverts commit 8cb8e6f168
.
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>
This commit is contained in:
parent
fad003b6c8
commit
b0239c80fe
|
@ -3089,14 +3089,8 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr
|
||||||
if (!sk)
|
if (!sk)
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
|
|
||||||
if (sk->sk_state != BT_CONFIG) {
|
if (sk->sk_state == BT_DISCONN)
|
||||||
struct l2cap_cmd_rej rej;
|
|
||||||
|
|
||||||
rej.reason = cpu_to_le16(0x0002);
|
|
||||||
l2cap_send_cmd(conn, cmd->ident, L2CAP_COMMAND_REJ,
|
|
||||||
sizeof(rej), &rej);
|
|
||||||
goto unlock;
|
goto unlock;
|
||||||
}
|
|
||||||
|
|
||||||
/* Reject if config buffer is too small. */
|
/* Reject if config buffer is too small. */
|
||||||
len = cmd_len - sizeof(*req);
|
len = cmd_len - sizeof(*req);
|
||||||
|
|
Loading…
Reference in New Issue