---

yaml --- r: 237303 b: refs/heads/master c: 7990681 h: refs/heads/master i: 237301: b36624c 237299: 93dc8be 237295: 7e292d8 v: v3
git-mirror · Feb 8, 2011 · 3e1c372 · 3e1c372
1 parent 9cbc35a
commit 3e1c372
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e702112ff68a554bcac16bb03ddc2b8e5425bcbf
+refs/heads/master: 7990681c409e8a31eac122342e64da6c3b77a249
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
@@ -2569,11 +2569,11 @@ static int l2cap_build_conf_req(struct sock *sk, void *data)
 	}
 
 done:
+	if (pi->imtu != L2CAP_DEFAULT_MTU)
+		l2cap_add_conf_opt(&ptr, L2CAP_CONF_MTU, 2, pi->imtu);
+
 	switch (pi->mode) {
 	case L2CAP_MODE_BASIC:
-		if (pi->imtu != L2CAP_DEFAULT_MTU)
-			l2cap_add_conf_opt(&ptr, L2CAP_CONF_MTU, 2, pi->imtu);
-
 		if (!(pi->conn->feat_mask & L2CAP_FEAT_ERTM) &&
 				!(pi->conn->feat_mask & L2CAP_FEAT_STREAMING))
 			break;