diff options
| author | Andrea Bittau <a.bittau@cs.ucl.ac.uk> | 2006-09-19 13:05:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 15:19:08 -0700 |
| commit | 8e27e4650cb7e73aa4dd97d860539e7605ac7e39 (patch) | |
| tree | 467ff3a8ecbb0fba014f917b42cc14f1f3665e32 | |
| parent | 23d06e3b986677ec57007a24891fa9deb09ac973 (diff) | |
| download | op-kernel-dev-8e27e4650cb7e73aa4dd97d860539e7605ac7e39.zip op-kernel-dev-8e27e4650cb7e73aa4dd97d860539e7605ac7e39.tar.gz | |
[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>
| -rw-r--r-- | net/dccp/ackvec.c | 3 | ||||
| -rw-r--r-- | net/dccp/ccids/ccid2.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/net/dccp/ackvec.c b/net/dccp/ackvec.c index 8dab723..bc5ff12 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); diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c index e961562..b1d90c0 100644 --- a/net/dccp/ccids/ccid2.c +++ b/net/dccp/ccids/ccid2.c @@ -582,8 +582,8 @@ static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb) * run length */ while (between48(seqp->ccid2s_seq,ackno_end_rl,ackno)) { - const u8 state = (*vector & - DCCP_ACKVEC_STATE_MASK) >> 6; + const u8 state = *vector & + DCCP_ACKVEC_STATE_MASK; /* new packet received or marked */ if (state != DCCP_ACKVEC_STATE_NOT_RECEIVED && |
