diff options
author | Tom Herbert <tom@herbertland.com> | 2015-07-31 19:52:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-07-31 20:07:11 -0400 |
commit | 67800f9b1f4eb5bbefc32e3f5044097354bc85b3 (patch) | |
tree | fe8539672e187703c52b6b9e0344f96c0e344551 /include/net/ipv6.h | |
parent | f70ea018da0631e10c26a02f5a82d626ffef5bd7 (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.h | 5 |
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, | |||
708 | 708 | ||
709 | #if IS_ENABLED(CONFIG_IPV6) | 709 | #if IS_ENABLED(CONFIG_IPV6) |
710 | static inline __be32 ip6_make_flowlabel(struct net *net, struct sk_buff *skb, | 710 | static inline __be32 ip6_make_flowlabel(struct net *net, struct sk_buff *skb, |
711 | __be32 flowlabel, bool autolabel) | 711 | __be32 flowlabel, bool autolabel, |
712 | struct flowi6 *fl6) | ||
712 | { | 713 | { |
713 | if (!flowlabel && (autolabel || net->ipv6.sysctl.auto_flowlabels)) { | 714 | if (!flowlabel && (autolabel || net->ipv6.sysctl.auto_flowlabels)) { |
714 | u32 hash; | 715 | u32 hash; |
715 | 716 | ||
716 | hash = skb_get_hash(skb); | 717 | hash = skb_get_hash_flowi6(skb, fl6); |
717 | 718 | ||
718 | /* Since this is being sent on the wire obfuscate hash a bit | 719 | /* Since this is being sent on the wire obfuscate hash a bit |
719 | * to minimize possbility that any useful information to an | 720 | * to minimize possbility that any useful information to an |