From: Tom Herbert Date: Tue, 10 May 2016 00:12:10 +0000 (-0700) Subject: ip6_gre: Set inner protocol correctly in __gre6_xmit X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d27bff9ca294ac76548ee97db5d92f39e4752a01;p=linux-beck.git ip6_gre: Set inner protocol correctly in __gre6_xmit Need to use adjusted protocol value for setting inner protocol. Signed-off-by: Tom Herbert Signed-off-by: David S. Miller --- diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 509fb9273771..ec209f4d3312 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -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);