* [RFC] Bluetooth: Don't send ERTM configuration option when disabled
@ 2014-07-09 9:53 Marcel Holtmann
2014-07-09 12:19 ` Johan Hedberg
0 siblings, 1 reply; 2+ messages in thread
From: Marcel Holtmann @ 2014-07-09 9:53 UTC (permalink / raw)
To: linux-bluetooth
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>
---
net/bluetooth/l2cap_core.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index bf379a379fa0..87eb4b37e243 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -3233,6 +3233,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;
--
1.9.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [RFC] Bluetooth: Don't send ERTM configuration option when disabled
2014-07-09 9:53 [RFC] Bluetooth: Don't send ERTM configuration option when disabled Marcel Holtmann
@ 2014-07-09 12:19 ` Johan Hedberg
0 siblings, 0 replies; 2+ messages in thread
From: Johan Hedberg @ 2014-07-09 12:19 UTC (permalink / raw)
To: Marcel Holtmann; +Cc: linux-bluetooth
Hi Marcel,
On Wed, Jul 09, 2014, Marcel Holtmann wrote:
> 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>
> ---
> net/bluetooth/l2cap_core.c | 3 +++
> 1 file changed, 3 insertions(+)
Applied to bluetooth-next. Thanks.
Johan
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-07-09 12:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-09 9:53 [RFC] Bluetooth: Don't send ERTM configuration option when disabled Marcel Holtmann
2014-07-09 12:19 ` Johan Hedberg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).