aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/netfilter/nf_nat_core.c2
-rw-r--r--net/netfilter/nf_conntrack_core.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c
index 58ab7a4611dd..76600f8d434b 100644
--- a/net/ipv4/netfilter/nf_nat_core.c
+++ b/net/ipv4/netfilter/nf_nat_core.c
@@ -57,7 +57,7 @@ hash_by_src(const struct net *net, u16 zone,
57 /* Original src, to ensure we map it consistently if poss. */ 57 /* Original src, to ensure we map it consistently if poss. */
58 hash = jhash_3words((__force u32)tuple->src.u3.ip, 58 hash = jhash_3words((__force u32)tuple->src.u3.ip,
59 (__force u32)tuple->src.u.all ^ zone, 59 (__force u32)tuple->src.u.all ^ zone,
60 tuple->dst.protonum, 0); 60 tuple->dst.protonum, nf_conntrack_hash_rnd);
61 return ((u64)hash * net->ipv4.nat_htable_size) >> 32; 61 return ((u64)hash * net->ipv4.nat_htable_size) >> 32;
62} 62}
63 63
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 8b2842e321fb..b76090fd92c1 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -67,6 +67,7 @@ DEFINE_PER_CPU(struct nf_conn, nf_conntrack_untracked);
67EXPORT_PER_CPU_SYMBOL(nf_conntrack_untracked); 67EXPORT_PER_CPU_SYMBOL(nf_conntrack_untracked);
68 68
69unsigned int nf_conntrack_hash_rnd __read_mostly; 69unsigned int nf_conntrack_hash_rnd __read_mostly;
70EXPORT_SYMBOL_GPL(nf_conntrack_hash_rnd);
70 71
71static u32 hash_conntrack_raw(const struct nf_conntrack_tuple *tuple, u16 zone) 72static u32 hash_conntrack_raw(const struct nf_conntrack_tuple *tuple, u16 zone)
72{ 73{