Commit 5f733ee6 authored Jun 01, 2017 by Liam McBirnie Committed by David S. Miller Jun 04, 2017

ip6_tunnel: fix traffic class routing for tunnels



ip6_route_output() requires that the flowlabel contains the traffic
class for policy routing.

Commit 0e9a7095 ("ip6_tunnel, ip6_gre: fix setting of DSCP on
encapsulated packets") removed the code which previously added the
traffic class to the flowlabel.

The traffic class is added here because only route lookup needs the
flowlabel to contain the traffic class.

Fixes: 0e9a7095 ("ip6_tunnel, ip6_gre: fix setting of DSCP on encapsulated packets")
Signed-off-by: Liam McBirnie <liam.mcbirnie@boeing.com>
Acked-by: Peter Dawson <peter.a.dawson@boeing.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 24609669

net/ipv6/ip6_tunnel.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1095,6 +1095,9 @@ int ip6_tnl_xmit(struct sk_buff skb, struct net_device dev, __u8 dsfield,

		if (!dst) {
		route_lookup:
		/* add dsfield to flowlabel for route lookup */
		fl6->flowlabel = ip6_make_flowinfo(dsfield, fl6->flowlabel);

		dst = ip6_route_output(net, NULL, fl6);

		if (dst->error)

Admin message