path: root/include/net/ipv6.h
diff options
authorMichal Kubecek <mkubecek@suse.cz>2018-06-04 11:36:05 +0200
committerDavid S. Miller <davem@davemloft.net>2018-06-04 13:21:18 -0400
commitfa1be7e01ea863e911349e30456706749518eeab (patch)
treefcd60cdc288535ec0a71ba41f7e007854c53e073 /include/net/ipv6.h
parentRevert "ipv6: omit traffic class when calculating flow hash" (diff)
ipv6: omit traffic class when calculating flow hash
Some of the code paths calculating flow hash for IPv6 use flowlabel member of struct flowi6 which, despite its name, encodes both flow label and traffic class. If traffic class changes within a TCP connection (as e.g. ssh does), ECMP route can switch between path. It's also inconsistent with other code paths where ip6_flowlabel() (returning only flow label) is used to feed the key. Use only flow label everywhere, including one place where hash key is set using ip6_flowinfo(). Fixes: 51ebd3181572 ("ipv6: add support of equal cost multipath (ECMP)") Fixes: f70ea018da06 ("net: Add functions to get skb->hash based on flow structures") Signed-off-by: Michal Kubecek <mkubecek@suse.cz> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
1 files changed, 5 insertions, 0 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 798558fd1681..16475c269749 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -907,6 +907,11 @@ static inline __be32 ip6_make_flowinfo(unsigned int tclass, __be32 flowlabel)
return htonl(tclass << IPV6_TCLASS_SHIFT) | flowlabel;
+static inline __be32 flowi6_get_flowlabel(const struct flowi6 *fl6)
+ return fl6->flowlabel & IPV6_FLOWLABEL_MASK;
* Prototypes exported by ipv6