From e42482882788a906947ab09cec7e1a119b9b5f73 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Wed, 5 Sep 2012 10:10:28 +0000 Subject: [PATCH] --- yaml --- r: 327851 b: refs/heads/master c: 5693d68df6883f039d24a4ce8b23ac48f94a73e5 h: refs/heads/master i: 327849: b3698bcde046899a0caf418272ffec9868a56d07 327847: 84e0c7830cf4c4775ac1f8b5f7cc8e9668951fee v: v3 --- [refs] | 2 +- trunk/net/netfilter/nf_nat_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4e04edaec250..7ec2fa84a285 100644 --- 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 index 29d445235199..1816ad381485 100644 --- 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);