diff options
| author |   Marcel Holtmann <marcel@holtmann.org> | 2014-07-09 11:53:35 +0200 |
|---|---|---|
| committer |   Johan Hedberg <johan.hedberg@intel.com> | 2014-07-09 13:53:36 +0300 |
| commit | 6fea7ad1d338dba592d65423427a997f1b7ff485 (patch) | |
| tree | 32c0c62bf32f9623e1bc61c5b3d5e111b8402f48 /net/bluetooth | |
| parent | Bluetooth: Fix setting HCI_CONNECTABLE from ioctl code (diff) | |
| download | linux-dev-6fea7ad1d338dba592d65423427a997f1b7ff485.tar.xz linux-dev-6fea7ad1d338dba592d65423427a997f1b7ff485.zip | |
Bluetooth: Don't send ERTM configuration option when disabled
When ERTM support is disabled, then do not even send ERTM configuration
option even if the remote side supports it.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index d006e6c0e3b4..8680aae678ce 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -3234,6 +3234,9 @@ done: switch (chan->mode) { case L2CAP_MODE_BASIC: + if (disable_ertm) + break; + if (!(chan->conn->feat_mask & L2CAP_FEAT_ERTM) && !(chan->conn->feat_mask & L2CAP_FEAT_STREAMING)) break; |