2009-12-15 22:13:27

by Gustavo F. Padovan

Subject: [PATCH 1/1] Bluetooth: Ack I-frames before retransmit missing packet

Moving the Ack to before l2cap_retransmit_frame() we can avoid the case
where txWindow is full and the packet can't be retransmited.

Signed-off-by: Gustavo F. Padovan <[email protected]>
---
net/bluetooth/l2cap.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 2a2da9d..bb79946 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -3505,9 +3505,9 @@ static inline int l2cap_data_channel_sframe(struct sock *sk, u16 rx_control, str
pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;

if (rx_control & L2CAP_CTRL_POLL) {
- l2cap_retransmit_frame(sk, tx_seq);
pi->expected_ack_seq = tx_seq;
l2cap_drop_acked_frames(sk);
+ l2cap_retransmit_frame(sk, tx_seq);
l2cap_ertm_send(sk);
if (pi->conn_state & L2CAP_CONN_WAIT_F) {
pi->srej_save_reqseq = tx_seq;
--
1.6.4.4

2009-12-17 20:05:49

by Marcel Holtmann

Subject: Re: [PATCH 1/1] Bluetooth: Ack I-frames before retransmit missing packet

Hi Gustavo,

> Moving the Ack to before l2cap_retransmit_frame() we can avoid the case
> where txWindow is full and the packet can't be retransmited.

patch has been applied. Thanks.

Regards

Marcel