From: "Gustavo F. Padovan" <padovan@profusion.mobi>
To: linux-bluetooth@vger.kernel.org
Cc: jprvita@profusion.mobi, gustavo@padovan.org, marcel@holtmann.org
Subject: [PATCH 08/11] Bluetooth: Stop ack_timer if ERTM enters in Local Busy or SREJ_SENT
Date: Mon, 31 May 2010 16:05:24 -0300 [thread overview]
Message-ID: <1275332727-16263-8-git-send-email-padovan@profusion.mobi> (raw)
In-Reply-To: <1275332727-16263-7-git-send-email-padovan@profusion.mobi>
The ack_timer is implemation specific, disabling it in such situation
avoids some potencial errors in the ERTM protocol.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Reviewed-by: João Paulo Rechi Vita <jprvita@profusion.mobi>
---
net/bluetooth/l2cap.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 7a8454a..35b7791 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -3632,6 +3632,8 @@ static int l2cap_push_rx_skb(struct sock *sk, struct sk_buff *skb, u16 control)
pi->conn_state |= L2CAP_CONN_RNR_SENT;
+ del_timer(&pi->ack_timer);
+
queue_work(_busy_wq, &pi->busy_work);
return err;
@@ -3881,6 +3883,8 @@ static inline int l2cap_data_channel_iframe(struct sock *sk, u16 rx_control, str
pi->conn_state |= L2CAP_CONN_SEND_PBIT;
l2cap_send_srejframe(sk, tx_seq);
+
+ del_timer(&pi->ack_timer);
}
return 0;
--
1.6.4.4
next prev parent reply other threads:[~2010-05-31 19:05 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-31 19:05 [PATCH 01/11] Bluetooth: Remove max_tx and tx_window modules paramenter from L2CAP Gustavo F. Padovan
2010-05-31 19:05 ` [PATCH 02/11] Bluetooth: Remove L2CAP Extended Features from Kconfig Gustavo F. Padovan
2010-05-31 19:05 ` [PATCH 03/11] Bluetooth: Fix drop of packets with invalid req_seq/tx_seq Gustavo F. Padovan
2010-05-31 19:05 ` [PATCH 04/11] Bluetooth: Check skb_clone return to avoid NULL dereference Gustavo F. Padovan
2010-05-31 19:05 ` [PATCH 05/11] Bluetooth: Fix ERTM vars increment Gustavo F. Padovan
2010-05-31 19:05 ` [PATCH 06/11] Bluetooth: Check packet FCS earlier Gustavo F. Padovan
2010-05-31 19:05 ` [PATCH 07/11] Bluetooth: Only check SAR bits if frame is I-frame Gustavo F. Padovan
2010-05-31 19:05 ` Gustavo F. Padovan [this message]
2010-05-31 19:05 ` [PATCH 09/11] Bluetooth: Fix ERTM channel shutdown Gustavo F. Padovan
2010-05-31 19:05 ` [PATCH 10/11] Bluetooth: Fix crash when sending frames after connection is closed Gustavo F. Padovan
2010-05-31 19:05 ` [PATCH 11/11] Bluetooth: Fix handle of received P-bit Gustavo F. Padovan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1275332727-16263-8-git-send-email-padovan@profusion.mobi \
--to=padovan@profusion.mobi \
--cc=gustavo@padovan.org \
--cc=jprvita@profusion.mobi \
--cc=linux-bluetooth@vger.kernel.org \
--cc=marcel@holtmann.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).