diff options
| author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2007-03-20 12:00:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:26:44 -0400 |
| commit | d52de17b8cf36d43a9d6977e7861a9f415541c6b (patch) | |
| tree | 9746b89deb8b48b043a2de4016145c97f45765ad /net/dccp/dccp.h | |
| parent | 0aec51c86986f61de26dd04913667af544a8b8eb (diff) | |
[DCCP]: Make `before' relation unambiguous
Problem:
Diffstat (limited to 'net/dccp/dccp.h')
| -rw-r--r-- | net/dccp/dccp.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h index afb313ff216e..1615986a8d92 100644 --- a/net/dccp/dccp.h +++ b/net/dccp/dccp.h | |||
| @@ -124,14 +124,11 @@ static inline s64 dccp_delta_seqno(const u64 seqno1, const u64 seqno2) | |||
| 124 | /* is seq1 < seq2 ? */ | 124 | /* is seq1 < seq2 ? */ |
| 125 | static inline int before48(const u64 seq1, const u64 seq2) | 125 | static inline int before48(const u64 seq1, const u64 seq2) |
| 126 | { | 126 | { |
| 127 | return (s64)((seq1 << 16) - (seq2 << 16)) < 0; | 127 | return (s64)((seq2 << 16) - (seq1 << 16)) > 0; |
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | /* is seq1 > seq2 ? */ | 130 | /* is seq1 > seq2 ? */ |
| 131 | static inline int after48(const u64 seq1, const u64 seq2) | 131 | #define after48(seq1, seq2) before48(seq2, seq1) |
| 132 | { | ||
| 133 | return (s64)((seq2 << 16) - (seq1 << 16)) < 0; | ||
| 134 | } | ||
| 135 | 132 | ||
| 136 | /* is seq2 <= seq1 <= seq3 ? */ | 133 | /* is seq2 <= seq1 <= seq3 ? */ |
| 137 | static inline int between48(const u64 seq1, const u64 seq2, const u64 seq3) | 134 | static inline int between48(const u64 seq1, const u64 seq2, const u64 seq3) |