diff options
| author | Mat Martineau | 2012-10-24 00:24:21 +0200 |
|---|---|---|
| committer | Gustavo Padovan | 2012-10-24 04:25:50 +0200 |
| commit | a549574da39f0a6df68ffdb72dd015d04a8486de (patch) | |
| tree | 337d782429480806fa91ce6b1fd587fa6189ff9d /net/bluetooth/l2cap_core.c | |
| parent | Bluetooth: Configure appropriate timeouts for AMP controllers (diff) | |
| download | kernel-qcow2-linux-a549574da39f0a6df68ffdb72dd015d04a8486de.tar.gz kernel-qcow2-linux-a549574da39f0a6df68ffdb72dd015d04a8486de.tar.xz kernel-qcow2-linux-a549574da39f0a6df68ffdb72dd015d04a8486de.zip | |
Bluetooth: Ignore BR/EDR packet size constraints when fragmenting for AMP
When operating over BR/EDR, ERTM accounts for the maximum over-the-air
packet size when setting the PDU size. AMP controllers do not use the
same over-the-air packets, so the PDU size should only be based on the
HCI MTU of the AMP controller.
Signed-off-by: Mat Martineau <mathewm@codeaurora.org>
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 6662ee34e754..ef86ebb92a00 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -2272,7 +2272,9 @@ static int l2cap_segment_sdu(struct l2cap_chan *chan, /* PDU size is derived from the HCI MTU */ pdu_len = chan->conn->mtu; - pdu_len = min_t(size_t, pdu_len, L2CAP_BREDR_MAX_PAYLOAD); + /* Constrain PDU size for BR/EDR connections */ + if (!chan->hs_hcon) + pdu_len = min_t(size_t, pdu_len, L2CAP_BREDR_MAX_PAYLOAD); /* Adjust for largest possible L2CAP overhead. */ if (chan->fcs) |