diff options
| author | Daniel Borkmann <daniel@iogearbox.net> | 2016-03-18 18:37:57 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-20 13:44:34 -0400 |
| commit | eaa93bf4c6090809395605d1775a0db9970eda5e (patch) | |
| tree | 8e846dfdd036e73e29bc6891181c78e94f988226 /include/net | |
| parent | c78a85a8430e35aecd53e190a2f6b999062b1037 (diff) | |
| download | op-kernel-dev-eaa93bf4c6090809395605d1775a0db9970eda5e.zip op-kernel-dev-eaa93bf4c6090809395605d1775a0db9970eda5e.tar.gz | |
vxlan: fix populating tclass in vxlan6_get_route
Jiri mentioned that flowi6_tos of struct flowi6 is never used/read
anywhere. In fact, rest of the kernel uses the flowi6's flowlabel,
where the traffic class _and_ the flowlabel (aka flowinfo) is encoded.
For example, for policy routing, fib6_rule_match() uses ip6_tclass()
that is applied on the flowlabel member for matching on tclass. Similar
fix is needed for geneve, where flowi6_tos is set as well. Installing
a v6 blackhole rule that f.e. matches on tos is now working with vxlan.
Fixes: 1400615d64cf ("vxlan: allow setting ipv6 traffic class")
Reported-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ipv6.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index f3c9857..d0aeb97 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -835,6 +835,12 @@ static inline u8 ip6_tclass(__be32 flowinfo) { return ntohl(flowinfo & IPV6_TCLASS_MASK) >> IPV6_TCLASS_SHIFT; } + +static inline __be32 ip6_make_flowinfo(unsigned int tclass, __be32 flowlabel) +{ + return htonl(tclass << IPV6_TCLASS_SHIFT) | flowlabel; +} + /* * Prototypes exported by ipv6 */ |
