Patch "ip6_tunnel: fix traffic class routing for tunnels" has been added to the 4.11-stable tree

This is a note to let you know that I've just added the patch titled

ip6_tunnel: fix traffic class routing for tunnels

to the 4.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
ip6_tunnel-fix-traffic-class-routing-for-tunnels.patch
and it can be found in the queue-4.11 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Liam McBirnie <[email protected]>
Date: Thu, 1 Jun 2017 15:36:01 +1000
Subject: ip6_tunnel: fix traffic class routing for tunnels

From: Liam McBirnie <[email protected]>

[ Upstream commit 5f733ee68f9a4df94775299ac6a7ab260704f6ed ]

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

Commit 0e9a709560db ("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.

---
 net/ipv6/ip6_tunnel.c |    3 +++
 1 file changed, 3 insertions(+)

@@ -1095,6 +1095,9 @@ int ip6_tnl_xmit(struct sk_buff *skb, st
 
 	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)

Patches currently in stable-queue which might be from [email protected] are

queue-4.11/ip6_tunnel-fix-traffic-class-routing-for-tunnels.patch