diff options
| author |   Gustavo F. Padovan <padovan@profusion.mobi> | 2010-05-01 16:15:43 -0300 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2010-05-10 09:28:51 +0200 |
| commit | afefdbc4cf3b9d409d07e1e5264e7ff88bc48711 (patch) | |
| tree | e3908d245e64c0b242da0e9dbec8cd278338f13c /net/bluetooth/l2cap.c | |
| parent | Bluetooth: Check if mode is supported on getsockopt (diff) | |
| download | linux-dev-afefdbc4cf3b9d409d07e1e5264e7ff88bc48711.tar.xz linux-dev-afefdbc4cf3b9d409d07e1e5264e7ff88bc48711.zip | |
Bluetooth: Fix SDU reassembly under SREJ
The code was reusing the control var without its reinitialization.
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>
Diffstat (limited to '')
| -rw-r--r-- | net/bluetooth/l2cap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index bf5bb7dc6abf..478def700c7c 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c @@ -3446,14 +3446,14 @@ drop: static void l2cap_check_srej_gap(struct sock *sk, u8 tx_seq) { struct sk_buff *skb; - u16 control = 0; + u16 control; while((skb = skb_peek(SREJ_QUEUE(sk)))) { if (bt_cb(skb)->tx_seq != tx_seq) break; skb = skb_dequeue(SREJ_QUEUE(sk)); - control |= bt_cb(skb)->sar << L2CAP_CTRL_SAR_SHIFT; + control = bt_cb(skb)->sar << L2CAP_CTRL_SAR_SHIFT; l2cap_sar_reassembly_sdu(sk, skb, control); l2cap_pi(sk)->buffer_seq_srej = (l2cap_pi(sk)->buffer_seq_srej + 1) % 64; |