diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2007-07-26 12:33:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-26 14:11:56 -0400 |
commit | a34c45896a723ee7b13128ac8bf564ea42fcd1eb (patch) | |
tree | 0b898fb2e780cb0a11a44c347745f2cb2f4a78af /net/netfilter/xt_connlimit.c | |
parent | e0e5de00b0ee5a3b652d829f2c1e89265e9c6a99 (diff) |
netfilter endian regressions
no real bugs, just misannotations cropping up
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net/netfilter/xt_connlimit.c')
-rw-r--r-- | net/netfilter/xt_connlimit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/xt_connlimit.c b/net/netfilter/xt_connlimit.c index 3335dd5be96..06cff1d1369 100644 --- a/net/netfilter/xt_connlimit.c +++ b/net/netfilter/xt_connlimit.c | |||
@@ -42,13 +42,13 @@ struct xt_connlimit_data { | |||
42 | static u_int32_t connlimit_rnd; | 42 | static u_int32_t connlimit_rnd; |
43 | static bool connlimit_rnd_inited; | 43 | static bool connlimit_rnd_inited; |
44 | 44 | ||
45 | static inline unsigned int connlimit_iphash(u_int32_t addr) | 45 | static inline unsigned int connlimit_iphash(__be32 addr) |
46 | { | 46 | { |
47 | if (unlikely(!connlimit_rnd_inited)) { | 47 | if (unlikely(!connlimit_rnd_inited)) { |
48 | get_random_bytes(&connlimit_rnd, sizeof(connlimit_rnd)); | 48 | get_random_bytes(&connlimit_rnd, sizeof(connlimit_rnd)); |
49 | connlimit_rnd_inited = true; | 49 | connlimit_rnd_inited = true; |
50 | } | 50 | } |
51 | return jhash_1word(addr, connlimit_rnd) & 0xFF; | 51 | return jhash_1word((__force __u32)addr, connlimit_rnd) & 0xFF; |
52 | } | 52 | } |
53 | 53 | ||
54 | static inline unsigned int | 54 | static inline unsigned int |
@@ -66,7 +66,7 @@ connlimit_iphash6(const union nf_conntrack_address *addr, | |||
66 | for (i = 0; i < ARRAY_SIZE(addr->ip6); ++i) | 66 | for (i = 0; i < ARRAY_SIZE(addr->ip6); ++i) |
67 | res.ip6[i] = addr->ip6[i] & mask->ip6[i]; | 67 | res.ip6[i] = addr->ip6[i] & mask->ip6[i]; |
68 | 68 | ||
69 | return jhash2(res.ip6, ARRAY_SIZE(res.ip6), connlimit_rnd) & 0xFF; | 69 | return jhash2((u32 *)res.ip6, ARRAY_SIZE(res.ip6), connlimit_rnd) & 0xFF; |
70 | } | 70 | } |
71 | 71 | ||
72 | static inline bool already_closed(const struct nf_conn *conn) | 72 | static inline bool already_closed(const struct nf_conn *conn) |