path: root/net
diff options
authorIsaku Yamahata <yamahata@valinux.co.jp>2012-12-24 16:51:04 +0000
committerDavid S. Miller <davem@davemloft.net>2012-12-26 15:19:56 -0800
commitae782bb16c35ce27512beeda9be6024c88f85b08 (patch)
tree10d52422a5e8b0cf7380cf5807eb7036855c3989 /net
parent861aa6d56de8147249c8a04a4e87fb7c3600cca1 (diff)
ipv6/ip6_gre: set transport header correctly
ip6gre_xmit2() incorrectly sets transport header to inner payload instead of GRE header. It seems copy-and-pasted from ipip.c. Set transport header to gre header. (In ipip case the transport header is the inner ip header, so that's correct.) Found by inspection. In practice the incorrect transport header doesn't matter because the skb usually is sent to another net_device or socket, so the transport header isn't referenced. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index 867466c96aa..c727e471275 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -758,8 +758,6 @@ static netdev_tx_t ip6gre_xmit2(struct sk_buff *skb,
skb_dst_set_noref(skb, dst);
- skb->transport_header = skb->network_header;
proto = NEXTHDR_GRE;
if (encap_limit >= 0) {
init_tel_txopt(&opt, encap_limit);
@@ -768,6 +766,7 @@ static netdev_tx_t ip6gre_xmit2(struct sk_buff *skb,
skb_push(skb, gre_hlen);
+ skb_set_transport_header(skb, sizeof(*ipv6h));
* Push down and install the IP header.