aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorGustavo F. Padovan <gustavo@las.ic.unicamp.br>2009-08-26 04:04:01 -0300
committerMarcel Holtmann <marcel@holtmann.org>2009-08-26 00:12:20 -0700
commitca42a613c92d131ff02d5714419d58c36c3459f3 (patch)
treeb40e2f5855260ab5eafb6f15517ba327db489b0b /net/bluetooth
parentcbe86b98a6aceefe943ada1471eb52fd9ac4c504 (diff)
downloadkernel_samsung_smdk4412-ca42a613c92d131ff02d5714419d58c36c3459f3.zip
kernel_samsung_smdk4412-ca42a613c92d131ff02d5714419d58c36c3459f3.tar.gz
kernel_samsung_smdk4412-ca42a613c92d131ff02d5714419d58c36c3459f3.tar.bz2
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>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/l2cap.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index e5847c5..0a36c61 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;