diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-01-24 16:01:43 -0200 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-02-08 01:40:04 -0200 |
| commit | 7990681c409e8a31eac122342e64da6c3b77a249 (patch) | |
| tree | b596f7ffe7cedf65d68dda41520a329a7314bac3 | |
| parent | e702112ff68a554bcac16bb03ddc2b8e5425bcbf (diff) | |
| download | kernel-common-7990681c409e8a31eac122342e64da6c3b77a249.tar.gz kernel-common-7990681c409e8a31eac122342e64da6c3b77a249.tar.bz2 kernel-common-7990681c409e8a31eac122342e64da6c3b77a249.zip | |
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>
| -rw-r--r-- | net/bluetooth/l2cap.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |