From 9c3a0abeb45bb63f15395e06a4ea93886555fb48 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Mon, 18 Feb 2013 10:18:52 +0000 Subject: [PATCH] --- yaml --- r: 352753 b: refs/heads/master c: 8064b3cf750e71fdaf306abb4433a93d0f45f4c9 h: refs/heads/master i: 352751: c413a2e2c776a1e511f04fd3c6953908d7168afc v: v3 --- [refs] | 2 +- trunk/net/ipv6/reassembly.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2664da894cc3..55ed9dd55e21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40d1ae57a0eb2ea8196e15cd2d54ffc186497522 +refs/heads/master: 8064b3cf750e71fdaf306abb4433a93d0f45f4c9 diff --git a/trunk/net/ipv6/reassembly.c b/trunk/net/ipv6/reassembly.c index 9a6428aaa2d8..3c6a77290c6e 100644 --- a/trunk/net/ipv6/reassembly.c +++ b/trunk/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); }