summaryrefslogtreecommitdiff
path: root/include/net/ipv6.h
diff options
context:
space:
mode:
authorTom Herbert <tom@herbertland.com>2015-07-31 16:52:11 -0700
committerDavid S. Miller <davem@davemloft.net>2015-07-31 17:07:11 -0700
commit67800f9b1f4eb5bbefc32e3f5044097354bc85b3 (patch)
treefe8539672e187703c52b6b9e0344f96c0e344551 /include/net/ipv6.h
parentf70ea018da0631e10c26a02f5a82d626ffef5bd7 (diff)
ipv6: Call skb_get_hash_flowi6 to get skb->hash in ip6_make_flowlabel
We can't call skb_get_hash here since the packet is not complete to do flow_dissector. Create hash based on flowi6 instead. Signed-off-by: Tom Herbert <tom@herbertland.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ipv6.h')
-rw-r--r--include/net/ipv6.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index eecdfc92f807..3e334b33ef3a 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -708,12 +708,13 @@ static inline void iph_to_flow_copy_v6addrs(struct flow_keys *flow,
#if IS_ENABLED(CONFIG_IPV6)
static inline __be32 ip6_make_flowlabel(struct net *net, struct sk_buff *skb,
- __be32 flowlabel, bool autolabel)
+ __be32 flowlabel, bool autolabel,
+ struct flowi6 *fl6)
{
if (!flowlabel && (autolabel || net->ipv6.sysctl.auto_flowlabels)) {
u32 hash;
- hash = skb_get_hash(skb);
+ hash = skb_get_hash_flowi6(skb, fl6);
/* Since this is being sent on the wire obfuscate hash a bit
* to minimize possbility that any useful information to an