From: Gustavo F. Padovan <gustavo@las.ic.unicamp.br>
Date: Wed, 26 Aug 2009 07:04:01 +0000 (-0300)
Subject: Bluetooth: Acknowledge L2CAP packets when receiving RR-frames (F-bit=1)
X-Git-Tag: MMI-PSA29.97-13-9~26976^2~221^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ca42a613c92d131ff02d5714419d58c36c3459f3;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Bluetooth: Acknowledge L2CAP packets when receiving RR-frames (F-bit=1)

Implement the Recv ReqSeqAndFBit event when a RR frame with F bit set is
received.

Signed-off-by: Gustavo F. Padovan <gustavo@las.ic.unicamp.br>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index e5847c5849d7..0a36c61c011f 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -3348,9 +3348,13 @@ static inline int l2cap_data_channel_sframe(struct sock *sk, u16 rx_control, str
 	case L2CAP_SUPER_RCV_READY:
 		if (rx_control & L2CAP_CTRL_POLL) {
 			u16 control = L2CAP_CTRL_FINAL;
-			control |= L2CAP_SUPER_RCV_READY;
+			control |= L2CAP_SUPER_RCV_READY |
+				(pi->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT);
 			l2cap_send_sframe(l2cap_pi(sk), control);
 		} else if (rx_control & L2CAP_CTRL_FINAL) {
+			pi->expected_ack_seq = tx_seq;
+			l2cap_drop_acked_frames(sk);
+
 			if (!(pi->conn_state & L2CAP_CONN_WAIT_F))
 				break;