Skip to content

Commit

Permalink
Revert "Bluetooth: Don't accept ConfigReq if we aren't in the BT_CONF…
Browse files Browse the repository at this point in the history
…IG state"

This reverts commit 8cb8e6f.

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>
  • Loading branch information
Gustavo F. Padovan committed Sep 30, 2010
1 parent fad003b commit b0239c8
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions net/bluetooth/l2cap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit b0239c8

Please sign in to comment.