---

yaml --- r: 203850 b: refs/heads/master c: 742e519 h: refs/heads/master v: v3
git-mirror · Jul 21, 2010 · 82a8e21 · 82a8e21
1 parent 856ebbe
commit 82a8e21
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);