summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2013-02-18 10:18:52 +0000
committerDavid S. Miller <davem@davemloft.net>2013-02-18 15:28:00 -0500
commit8064b3cf750e71fdaf306abb4433a93d0f45f4c9 (patch)
treeb6f55805b224da0cfbb29d9e2f1b19cfe0842eea /net
parent40d1ae57a0eb2ea8196e15cd2d54ffc186497522 (diff)
downloadlinux-3.10-8064b3cf750e71fdaf306abb4433a93d0f45f4c9.tar.gz
linux-3.10-8064b3cf750e71fdaf306abb4433a93d0f45f4c9.tar.bz2
linux-3.10-8064b3cf750e71fdaf306abb4433a93d0f45f4c9.zip
ipv6: fix a sparse warning
net/ipv6/reassembly.c:82:72: warning: incorrect type in argument 3 (different base types) net/ipv6/reassembly.c:82:72: expected unsigned int [unsigned] [usertype] c net/ipv6/reassembly.c:82:72: got restricted __be32 [usertype] id Signed-off-by: Eric Dumazet <edumazet@google.com> Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/reassembly.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index 9a6428aaa2d..3c6a77290c6 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -79,7 +79,8 @@ unsigned int inet6_hash_frag(__be32 id, const struct in6_addr *saddr,
{
u32 c;
- c = jhash_3words(ipv6_addr_hash(saddr), ipv6_addr_hash(daddr), id, rnd);
+ c = jhash_3words(ipv6_addr_hash(saddr), ipv6_addr_hash(daddr),
+ (__force u32)id, rnd);
return c & (INETFRAGS_HASHSZ - 1);
}