From 1fcea4bec63d93514849b5898aa61f934e70306c Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Sat, 18 Nov 2006 22:15:00 +0100
Subject: [PATCH] --- yaml --- r: 41039 b: refs/heads/master c:
 820ae1b865caa05e0614004d0183ca70de2b8665 h: refs/heads/master i:   41037:
 145f71455d5905c1f3cdf3b69f87aa2722b77780   41035:
 599ad5460bbcd0f4e6f664b7c8c3e88fdc3d5fc2   41031:
 6044b6e008a45a29da35954fb18861292a06f941   41023:
 903f660ce11a9c6e80db880d7d219189f49eddb8 v: v3

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

diff --git a/[refs] b/[refs]
index e884d79468ee..c0d24ad63230 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff2d367ac33b9278c9516ac1888207dac11d10b0
+refs/heads/master: 820ae1b865caa05e0614004d0183ca70de2b8665
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
index 2b3dcb8f90fa..c09d4a20d696 100644
--- a/trunk/net/bluetooth/l2cap.c
+++ b/trunk/net/bluetooth/l2cap.c
@@ -1353,12 +1353,12 @@ static inline int l2cap_conf_output(struct sock *sk, void **ptr)
 
 	/* Configure output options and let the other side know
 	 * which ones we don't like. */
-	if (pi->conf_mtu < pi->omtu) {
-		l2cap_add_conf_opt(ptr, L2CAP_CONF_MTU, 2, pi->omtu);
+	if (pi->conf_mtu < pi->omtu)
 		result = L2CAP_CONF_UNACCEPT;
-	} else {
+	else
 		pi->omtu = pi->conf_mtu;
-	}
+
+	l2cap_add_conf_opt(ptr, L2CAP_CONF_MTU, 2, pi->omtu);
 
 	BT_DBG("sk %p result %d", sk, result);
 	return result;