From: Gustavo F. Padovan <padovan@profusion.mobi>
Date: Mon, 24 Jan 2011 18:01:43 +0000 (-0200)
Subject: Bluetooth: Fix setting of MTU for ERTM and Streaming Mode
X-Git-Tag: MMI-PSA29.97-13-9~19291^2~16^2~578^2~273
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7990681c409e8a31eac122342e64da6c3b77a249;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Bluetooth: Fix setting of MTU for ERTM and Streaming Mode

The desired MTU should be sent in an Config_Req for all modes.

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
---

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 4bf98dfd24bc..cbaa7409d877 100644
--- a/net/bluetooth/l2cap.c
+++ b/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;