From 3e1c372bdec9d224ddaf1536246e86c27b240573 Mon Sep 17 00:00:00 2001
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
Date: Mon, 24 Jan 2011 16:01:43 -0200
Subject: [PATCH] --- yaml --- r: 237303 b: refs/heads/master c:
 7990681c409e8a31eac122342e64da6c3b77a249 h: refs/heads/master i:   237301:
 b36624c0bcb936b46dd1fc60632c21836f29297b   237299:
 93dc8be5d1a3ef9dfb518a018ea348c3cb0d27fe   237295:
 7e292d8fe0fa81d1dcfd2ed4ec2e66ab7dd84dfa v: v3

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

diff --git a/[refs] b/[refs]
index ce02161649b3..2755548e2b78 100644
--- 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
index 4bf98dfd24bc..cbaa7409d877 100644
--- 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;