From: Marcel Holtmann <marcel@holtmann.org>
Date: Sat, 18 Nov 2006 21:15:00 +0000 (+0100)
Subject: [Bluetooth] Always include MTU in L2CAP config responses
X-Git-Tag: v2.6.19~56^2~8
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=820ae1b865caa05e0614004d0183ca70de2b8665;p=linux-2.6-omap-h63xx.git

[Bluetooth] Always include MTU in L2CAP config responses

When sending a positive config response it shall include the actual
MTU to be used on this channel. This differs from the Bluetooth 1.1
specification where it was enough to acknowledge the config request.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 2b3dcb8f90f..c09d4a20d69 100644
--- a/net/bluetooth/l2cap.c
+++ b/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;