aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ackvec.c
diff options
context:
space:
mode:
authorAndrea Bittau <a.bittau@cs.ucl.ac.uk>2006-09-19 13:05:35 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-22 15:19:08 -0700
commit8e27e4650cb7e73aa4dd97d860539e7605ac7e39 (patch)
tree467ff3a8ecbb0fba014f917b42cc14f1f3665e32 /net/dccp/ackvec.c
parent[DCCP] ACKVEC: fix ackvector length calculation (diff)
downloadlinux-dev-8e27e4650cb7e73aa4dd97d860539e7605ac7e39.tar.xz
linux-dev-8e27e4650cb7e73aa4dd97d860539e7605ac7e39.zip
[DCCP] ackvec: Fix how DCCP_ACKVEC_STATE_NOT_RECEIVED is used
Fix the way state is masked out. DCCP_ACKVEC_STATE_NOT_RECEIVED is defined as appears in the packet, therefore bit shifting is not required. This fix allows CCID2 to correctly detect losses. Signed-off-by: Andrea Bittau <a.bittau@cs.ucl.ac.uk> Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ackvec.c')
-rw-r--r--net/dccp/ackvec.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/dccp/ackvec.c b/net/dccp/ackvec.c
index 8dab723cc704..bc5ff1212418 100644
--- a/net/dccp/ackvec.c
+++ b/net/dccp/ackvec.c
@@ -436,8 +436,7 @@ static void dccp_ackvec_check_rcv_ackvector(struct dccp_ackvec *av,
break;
found:
if (between48(avr->dccpavr_ack_seqno, ackno_end_rl, ackno)) {
- const u8 state = (*vector &
- DCCP_ACKVEC_STATE_MASK) >> 6;
+ const u8 state = *vector & DCCP_ACKVEC_STATE_MASK;
if (state != DCCP_ACKVEC_STATE_NOT_RECEIVED) {
#ifdef CONFIG_IP_DCCP_DEBUG
struct dccp_sock *dp = dccp_sk(sk);