[DCCP]: Fix for follows48
authorGerrit Renker <gerrit@erg.abdn.ac.uk>
Tue, 20 Mar 2007 16:03:47 +0000 (13:03 -0300)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 26 Apr 2007 05:26:45 +0000 (22:26 -0700)
The follows48 relation identifies whether 48-bit sequence number
x is the direct successor of y. Currently, it does not handle cases
of the following type correctly:

follows48(0x(prefix)10000LL, 0x(prefix)0FFFFLL)

where prefix is an arbitrary hex sequence of up to 7 digits.

This is fixed by reusing the new dccp_delta_seqno function.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/dccp/dccp.h

index 1615986a8d9241971aacd1d8c8908174de8adc48..c66a4581348f1a8bfc15293f27f64eb2970cafe7 100644 (file)
@@ -144,9 +144,7 @@ static inline u64 max48(const u64 seq1, const u64 seq2)
 /* is seq1 next seqno after seq2 */
 static inline int follows48(const u64 seq1, const u64 seq2)
 {
-       int diff = (seq1 & 0xFFFF) - (seq2 & 0xFFFF);
-
-       return diff==1;
+       return dccp_delta_seqno(seq2, seq1) == 1;
 }
 
 enum {