OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
faaebd1
)
Bluetooth: Fix expected_tx_seq calculation on L2CAP
author
Gustavo F. Padovan
<padovan@profusion.mobi>
Sat, 1 May 2010 19:15:36 +0000
(16:15 -0300)
committer
Marcel Holtmann
<marcel@holtmann.org>
Mon, 10 May 2010 07:28:46 +0000
(09:28 +0200)
All operation related to the txWindow should be modulo 64.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Reviewed-by: João Paulo Rechi Vita <jprvita@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/l2cap.c
patch
|
blob
|
history
diff --git
a/net/bluetooth/l2cap.c
b/net/bluetooth/l2cap.c
index
46f2264
..
401011a
100644
(file)
--- a/
net/bluetooth/l2cap.c
+++ b/
net/bluetooth/l2cap.c
@@
-3611,7
+3611,7
@@
static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk
if (pi->expected_tx_seq == tx_seq)
pi->expected_tx_seq = (pi->expected_tx_seq + 1) % 64;
else
- pi->expected_tx_seq =
tx_seq + 1
;
+ pi->expected_tx_seq =
(tx_seq + 1) % 64
;
l2cap_sar_reassembly_sdu(sk, skb, control);