From: Gustavo F. Padovan <padovan@profusion.mobi>
Date: Wed, 8 Sep 2010 17:59:44 +0000 (-0300)
Subject: Revert "Bluetooth: Don't accept ConfigReq if we aren't in the BT_CONFIG state"
X-Git-Tag: v2.6.36-rc8~2^2~15^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b0239c80fe89d5832a68a0f3121a9d5ec9fb763e;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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>
---

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index f2062aa..44a8fb0 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);