]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ip6_gre: Set inner protocol correctly in __gre6_xmit
authorTom Herbert <tom@herbertland.com>
Tue, 10 May 2016 00:12:10 +0000 (17:12 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 May 2016 04:39:27 +0000 (00:39 -0400)
Need to use adjusted protocol value for setting inner protocol.

Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/ip6_gre.c

index 509fb9273771816e6eec181fdea9c923af8b0cda..ec209f4d3312e78a4cf8ca55e3459b7b4901238a 100644 (file)
@@ -519,7 +519,7 @@ static netdev_tx_t __gre6_xmit(struct sk_buff *skb,
        gre_build_header(skb, tunnel->tun_hlen, tunnel->parms.o_flags,
                         protocol, tunnel->parms.o_key, htonl(tunnel->o_seqno));
 
-       skb_set_inner_protocol(skb, proto);
+       skb_set_inner_protocol(skb, protocol);
 
        return ip6_tnl_xmit(skb, dev, dsfield, fl6, encap_limit, pmtu,
                            NEXTHDR_GRE);