diff options
| author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2015-03-25 16:07:44 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-25 18:07:04 (GMT) |
| commit | b6a7719aedd7e5c0f2df7641aa47386111682df4 (patch) | |
| tree | f0374d5535a6670c1cb453cc6c0e15237e108376 /net/ipv4/route.c | |
| parent | 8fa38a38ac37a0ca5366cd62ba4339c2bab49db9 (diff) | |
| download | linux-b6a7719aedd7e5c0f2df7641aa47386111682df4.tar.xz | |
ipv4: hash net ptr into fragmentation bucket selection
As namespaces are sometimes used with overlapping ip address ranges,
we should also use the namespace as input to the hash to select the ip
fragmentation counter bucket.
Cc: Eric Dumazet <edumazet@google.com>
Cc: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/route.c')
| -rw-r--r-- | net/ipv4/route.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 649c8a3..be8703d 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -482,7 +482,7 @@ u32 ip_idents_reserve(u32 hash, int segs) } EXPORT_SYMBOL(ip_idents_reserve); -void __ip_select_ident(struct iphdr *iph, int segs) +void __ip_select_ident(struct net *net, struct iphdr *iph, int segs) { static u32 ip_idents_hashrnd __read_mostly; u32 hash, id; @@ -491,7 +491,7 @@ void __ip_select_ident(struct iphdr *iph, int segs) hash = jhash_3words((__force u32)iph->daddr, (__force u32)iph->saddr, - iph->protocol, + iph->protocol ^ net_hash_mix(net), ip_idents_hashrnd); id = ip_idents_reserve(hash, segs); iph->id = htons(id); |