summaryrefslogtreecommitdiff
path: root/net/ipv6/ip6_gre.c
diff options
context:
space:
mode:
authorTom Herbert <tom@herbertland.com>2016-05-10 03:12:10 +0300
committerDavid S. Miller <davem@davemloft.net>2016-05-10 07:39:27 +0300
commitd27bff9ca294ac76548ee97db5d92f39e4752a01 (patch)
treeeac40c45b294f7e320e1143ebf45358e62afc98a /net/ipv6/ip6_gre.c
parentf41fe3c2acc9e40304ac1dae0f243ef27fe85dee (diff)
downloadlinux-d27bff9ca294ac76548ee97db5d92f39e4752a01.tar.xz
ip6_gre: Set inner protocol correctly in __gre6_xmit
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>
Diffstat (limited to 'net/ipv6/ip6_gre.c')
-rw-r--r--net/ipv6/ip6_gre.c2
1 files changed, 1 insertions, 1 deletions
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);