On Thu, 18 May 2017 01:11:01 +0000 "I-Dawson, Peter A" <peter.a.daw...@boeing.com> wrote:
> This fix addresses two problems in the way the DSCP field is formulated on the > encapsulating header of IPv6 tunnels. > This fix addresses Bug 195661. > https://bugzilla.kernel.org/show_bug.cgi?id=195661 > > 1) The IPv6 tunneling code was manipulating the DSCP field of the > encapsulating > packet using the 32b flowlabel. Since the flowlabel is only the lower 20b it > was incorrect to assume that the upper 12b containing the DSCP and ECN fields > would remain intact when formulating the encapsulating header. This fix > handles the 'inherit' and 'fixed-value' DSCP cases explicitly using the > extant > dsfield u8 variable. > > 2) The use of INET_ECN_encapsulate(0, dsfield) in ip6_tnl_xmit was incorrect > and resulted in the DSCP value always being set to 0. > --- > net/ipv6/ip6_gre.c | 18 ++++++++++-------- > net/ipv6/ip6_tunnel.c | 28 +++++++++++++++++----------- > 2 files changed, 27 insertions(+), 19 deletions(-) This patch looks correct, but has trivial style issues like using spaces instead of tabs and other junk. Please run checkpatch.pl, look at the results and resubmit.
