From 83d36b0b7953deb811b3da410ef5ae94ffcb88dc Mon Sep 17 00:00:00 2001 From: "Gustavo F. Padovan" Date: Tue, 15 Dec 2009 20:13:27 -0200 Subject: [PATCH] --- yaml --- r: 178125 b: refs/heads/master c: 186ee8cf0130993dea8ab8867ff1af8a148f9ae6 h: refs/heads/master i: 178123: 52b70fb014a81cc0cfd50acec3276c64264bade4 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/l2cap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6c23a22b4e47..f3c80d40a5e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 186de9a33803c7ee20d9af75c9049b50e68a3a08 +refs/heads/master: 186ee8cf0130993dea8ab8867ff1af8a148f9ae6 diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c index 7db9a1f8f882..fb0f81d99f96 100644 --- a/trunk/net/bluetooth/l2cap.c +++ b/trunk/net/bluetooth/l2cap.c @@ -3471,9 +3471,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;