---

yaml --- r: 352753 b: refs/heads/master c: 8064b3c h: refs/heads/master i: 352751: c413a2e v: v3
git-mirror · Feb 18, 2013 · 9c3a0ab · 9c3a0ab
1 parent bedbee7
commit 9c3a0ab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);
 }