Commit 9fa7e4f7 authored Jun 30, 2011 by Gustavo Padovan

Bluetooth: Fix regression with incoming L2CAP connections



PTS test A2DP/SRC/SRC_SET/TC_SRC_SET_BV_02_I revealed that
( probably after the df3c3931 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.

Based on patch from: Ilia Kolomisnky <iliak@ti.com>

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

parent 7bb59df8

net/bluetooth/l2cap_core.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2323,7 +2323,8 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr

	sk = chan->sk;		sk = chan->sk;

	if (sk->sk_state != BT_CONFIG) {		if ((bt_sk(sk)->defer_setup && sk->sk_state != BT_CONNECT2) \|\|
			(!bt_sk(sk)->defer_setup && sk->sk_state != BT_CONFIG)) {
	struct l2cap_cmd_rej rej;		struct l2cap_cmd_rej rej;

	rej.reason = cpu_to_le16(0x0002);		rej.reason = cpu_to_le16(0x0002);