diff options
| author |   Al Viro <viro@ftp.linux.org.uk> | 2007-07-26 17:33:19 +0100 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-26 11:11:56 -0700 |
| commit | a34c45896a723ee7b13128ac8bf564ea42fcd1eb (patch) | |
| tree | 0b898fb2e780cb0a11a44c347745f2cb2f4a78af /net/netfilter/nf_conntrack_core.c | |
| parent | sun userflash is PCI-dependent (diff) | |
| download | linux-dev-a34c45896a723ee7b13128ac8bf564ea42fcd1eb.tar.xz linux-dev-a34c45896a723ee7b13128ac8bf564ea42fcd1eb.zip | |
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/nf_conntrack_core.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index aa086c83af80..0fe11889ce14 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -79,7 +79,8 @@ static u_int32_t __hash_conntrack(const struct nf_conntrack_tuple *tuple, a = jhash2(tuple->src.u3.all, ARRAY_SIZE(tuple->src.u3.all), (tuple->src.l3num << 16) | tuple->dst.protonum); b = jhash2(tuple->dst.u3.all, ARRAY_SIZE(tuple->dst.u3.all), - (tuple->src.u.all << 16) | tuple->dst.u.all); + ((__force __u16)tuple->src.u.all << 16) | + (__force __u16)tuple->dst.u.all); return jhash_2words(a, b, rnd) % size; } |