aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/dccp.h
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2005-08-14 20:05:53 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-29 19:00:12 -0400
commita10cedd4b905236603c6c4fd77cf338ebbfb1a60 (patch)
tree118dd7b2c02317220b5d275edb8c1d04cd9cbe51 /net/dccp/dccp.h
parenta1d3a35518779df0579dd9de0121354b49c68ddc (diff)
[DCCP]: Fix compiler warnings
may be a false warning if there always is something on ccid3hcrx_hist: net/dccp/ccids/ccid3.c: In function 'ccid3_hc_rx_packet_recv': net/dccp/ccids/ccid3.c:1634: warning: 'tstamp.tv_usec' may be used uninitialized in this function net/dccp/ccids/ccid3.c:1634: warning: 'tstamp.tv_sec' may be used uninitialized in this function const on inline functions doesn't have any effect: net/dccp/dccp.h:64: warning: type qualifiers ignored on function return type net/dccp/dccp.h:70: warning: type qualifiers ignored on function return type net/dccp/dccp.h:76: warning: type qualifiers ignored on function return type Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/dccp.h')
-rw-r--r--net/dccp/dccp.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h
index 148e8a65a10c..fff794c8dfff 100644
--- a/net/dccp/dccp.h
+++ b/net/dccp/dccp.h
@@ -60,20 +60,19 @@ extern void dccp_time_wait(struct sock *sk, int state, int timeo);
60extern struct proto dccp_v4_prot; 60extern struct proto dccp_v4_prot;
61 61
62/* is seq1 < seq2 ? */ 62/* is seq1 < seq2 ? */
63static inline const int before48(const u64 seq1, const u64 seq2) 63static inline int before48(const u64 seq1, const u64 seq2)
64{ 64{
65 return (const s64)((seq1 << 16) - (seq2 << 16)) < 0; 65 return (s64)((seq1 << 16) - (seq2 << 16)) < 0;
66} 66}
67 67
68/* is seq1 > seq2 ? */ 68/* is seq1 > seq2 ? */
69static inline const int after48(const u64 seq1, const u64 seq2) 69static inline int after48(const u64 seq1, const u64 seq2)
70{ 70{
71 return (const s64)((seq2 << 16) - (seq1 << 16)) < 0; 71 return (s64)((seq2 << 16) - (seq1 << 16)) < 0;
72} 72}
73 73
74/* is seq2 <= seq1 <= seq3 ? */ 74/* is seq2 <= seq1 <= seq3 ? */
75static inline const int between48(const u64 seq1, const u64 seq2, 75static inline int between48(const u64 seq1, const u64 seq2, const u64 seq3)
76 const u64 seq3)
77{ 76{
78 return (seq3 << 16) - (seq2 << 16) >= (seq1 << 16) - (seq2 << 16); 77 return (seq3 << 16) - (seq2 << 16) >= (seq1 << 16) - (seq2 << 16);
79} 78}