From 0ec30b424eb273170fff20749b4c00e3074116f6 Mon Sep 17 00:00:00 2001
From: Haijun Liu <haijun.liu@atheros.com>
Date: Thu, 30 Sep 2010 16:52:40 +0800
Subject: [PATCH] --- yaml --- r: 215254 b: refs/heads/master c:
 ab3e571564a5d8fa4923e2e858e574c931a014c7 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/net/bluetooth/l2cap.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 59d355ba86fa..5227a1bb5ffb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0175d629e096a5a59dde6cc91b32ac3160a44b9e
+refs/heads/master: ab3e571564a5d8fa4923e2e858e574c931a014c7
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
index 01c476239dd6..16049de49896 100644
--- a/trunk/net/bluetooth/l2cap.c
+++ b/trunk/net/bluetooth/l2cap.c
@@ -3171,6 +3171,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr
 
 	if (!(l2cap_pi(sk)->conf_state & L2CAP_CONF_REQ_SENT)) {
 		u8 buf[64];
+		l2cap_pi(sk)->conf_state |= L2CAP_CONF_REQ_SENT;
 		l2cap_send_cmd(conn, l2cap_get_ident(conn), L2CAP_CONF_REQ,
 					l2cap_build_conf_req(sk, buf), buf);
 		l2cap_pi(sk)->num_conf_req++;