Commit ab7e2e0d authored by Matthias May's avatar Matthias May Committed by Jakub Kicinski

ipv6: do not use RT_TOS for IPv6 flowlabel

According to Guillaume Nault RT_TOS should never be used for IPv6.

Quote:
RT_TOS() is an old macro used to interprete IPv4 TOS as described in
the obsolete RFC 1349. It's conceptually wrong to use it even in IPv4
code, although, given the current state of the code, most of the
existing calls have no consequence.

But using RT_TOS() in IPv6 code is always a bug: IPv6 never had a "TOS"
field to be interpreted the RFC 1349 way. There's no historical
compatibility to worry about.

Fixes: 571912c6 ("net: UDP tunnel encapsulation module for tunnelling different protocols like MPLS, IP, NSH etc.")
Acked-by: default avatarGuillaume Nault <gnault@redhat.com>
Signed-off-by: default avatarMatthias May <matthias.may@westermo.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent bcb0da7f
...@@ -1311,8 +1311,7 @@ struct dst_entry *ip6_dst_lookup_tunnel(struct sk_buff *skb, ...@@ -1311,8 +1311,7 @@ struct dst_entry *ip6_dst_lookup_tunnel(struct sk_buff *skb,
fl6.daddr = info->key.u.ipv6.dst; fl6.daddr = info->key.u.ipv6.dst;
fl6.saddr = info->key.u.ipv6.src; fl6.saddr = info->key.u.ipv6.src;
prio = info->key.tos; prio = info->key.tos;
fl6.flowlabel = ip6_make_flowinfo(RT_TOS(prio), fl6.flowlabel = ip6_make_flowinfo(prio, info->key.label);
info->key.label);
dst = ipv6_stub->ipv6_dst_lookup_flow(net, sock->sk, &fl6, dst = ipv6_stub->ipv6_dst_lookup_flow(net, sock->sk, &fl6,
NULL); NULL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment