From: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Date: Tue, 20 Mar 2007 15:45:59 +0000 (-0300)
Subject: [DCCP]: Make dccp_delta_seqno return signed numbers
X-Git-Tag: v2.6.22-rc1~1128^2~244
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0aec51c86986f61de26dd04913667af544a8b8eb;p=linux-2.6

[DCCP]: Make dccp_delta_seqno return signed numbers

Problem:
---

diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h
index a2c20a265b..afb313ff21 100644
--- a/net/dccp/dccp.h
+++ b/net/dccp/dccp.h
@@ -113,9 +113,12 @@ static inline void dccp_inc_seqno(u64 *seqno)
 	*seqno = ADD48(*seqno, 1);
 }
 
-static inline u64 dccp_delta_seqno(u64 seqno1, u64 seqno2)
+/* signed mod-2^48 distance: pos. if seqno1 < seqno2, neg. if seqno1 > seqno2 */
+static inline s64 dccp_delta_seqno(const u64 seqno1, const u64 seqno2)
 {
-	return ((seqno2 << 16) - (seqno1 << 16)) >> 16;
+	u64 delta = SUB48(seqno2, seqno1);
+
+	return TO_SIGNED48(delta);
 }
 
 /* is seq1 < seq2 ? */