---

yaml --- r: 327851 b: refs/heads/master c: 5693d68 h: refs/heads/master i: 327849: b3698bc 327847: 84e0c78 v: v3
git-mirror · Sep 9, 2012 · e424828 · e424828
1 parent 5ae28fb
commit e424828
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00545bec9412d130c77f72a08d6c8b6ad21d4a1e
+refs/heads/master: 5693d68df6883f039d24a4ce8b23ac48f94a73e5
diff --git a/trunk/net/netfilter/nf_nat_core.c b/trunk/net/netfilter/nf_nat_core.c
@@ -255,7 +255,7 @@ find_best_ips_proto(u16 zone, struct nf_conntrack_tuple *tuple,
 	 * client coming from the same IP (some Internet Banking sites
 	 * like this), even across reboots.
 	 */
-	j = jhash2((u32 *)&tuple->src.u3, sizeof(tuple->src.u3),
+	j = jhash2((u32 *)&tuple->src.u3, sizeof(tuple->src.u3) / sizeof(u32),
 		   range->flags & NF_NAT_RANGE_PERSISTENT ?
 			0 : (__force u32)tuple->dst.u3.all[max] ^ zone);