From 82a8e21b2e7be146495986197c332fc08b8f8ad9 Mon Sep 17 00:00:00 2001
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
Date: Tue, 8 Jun 2010 19:09:48 -0300
Subject: [PATCH] --- yaml --- r: 203850 b: refs/heads/master c:
 742e519b0db4a470008118b48f0baea6126e2122 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3cde35a13d88..0dfe98ca63dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85eb53c6f719523dde9e0658823dffd2664d4d1c
+refs/heads/master: 742e519b0db4a470008118b48f0baea6126e2122
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
index e78a7504d09c..03e9125dd74f 100644
--- a/trunk/net/bluetooth/l2cap.c
+++ b/trunk/net/bluetooth/l2cap.c
@@ -2617,8 +2617,9 @@ static int l2cap_parse_conf_req(struct sock *sk, void *data)
 			break;
 		}
 
-		if (!l2cap_mode_supported(pi->mode, pi->conn->feat_mask))
+		if (pi->mode != rfc.mode)
 			return -ECONNREFUSED;
+
 		break;
 	default:
 		pi->mode = l2cap_select_mode(rfc.mode, pi->conn->feat_mask);