From 962ad8865f00c73cd4e63b6c182b95e32f315a5e Mon Sep 17 00:00:00 2001
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Date: Thu, 29 Nov 2012 17:46:07 +0200
Subject: [PATCH] --- yaml --- r: 341953 b: refs/heads/master c:
 cbabee788ff881b87bbaf258caf080b49a61fa43 h: refs/heads/master i:   341951:
 b92d3eea9041f143fd9d54c104110c3d55427f8f v: v3

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

diff --git a/[refs] b/[refs]
index 73ce2951b78a..2c8f4a78ea4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60918918a9f3455859a4be0d4e381003cbdb843f
+refs/heads/master: cbabee788ff881b87bbaf258caf080b49a61fa43
diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c
index d22d183ddd45..8c432771d6f9 100644
--- a/trunk/net/bluetooth/l2cap_core.c
+++ b/trunk/net/bluetooth/l2cap_core.c
@@ -3431,6 +3431,13 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
 			l2cap_add_conf_opt(&ptr, L2CAP_CONF_EFS, sizeof(efs),
 					   (unsigned long) &efs);
 			break;
+
+		case L2CAP_CONF_FCS:
+			if (*result == L2CAP_CONF_PENDING)
+				if (val == L2CAP_FCS_NONE)
+					set_bit(CONF_NO_FCS_RECV,
+						&chan->conf_state);
+			break;
 		}
 	}