summaryrefslogtreecommitdiffstats
path: root/net/ipv4/gre_demux.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2016-06-19 06:52:05 +0200
committerDavid S. Miller <davem@davemloft.net>2016-06-19 07:11:39 +0200
commit9b8c6d7bf2e08a7d3eb6660a2bfaf29b8b49c329 (patch)
tree3e887221b1576e9fdcbada9b9fcb7ddb1e779ca8 /net/ipv4/gre_demux.c
parentipv6: translate ICMP_TIME_EXCEEDED to ICMPV6_TIME_EXCEED (diff)
downloadlinux-9b8c6d7bf2e08a7d3eb6660a2bfaf29b8b49c329.tar.xz
linux-9b8c6d7bf2e08a7d3eb6660a2bfaf29b8b49c329.zip
gre: better support for ICMP messages for gre+ipv6
ipgre_err() can call ip6_err_gen_icmpv6_unreach() for proper support of ipv4+gre+icmp+ipv6+... frames, used for example by traceroute/mtr. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/gre_demux.c')
-rw-r--r--net/ipv4/gre_demux.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/gre_demux.c b/net/ipv4/gre_demux.c
index 4c39f4fd332a..c4c3e439f424 100644
--- a/net/ipv4/gre_demux.c
+++ b/net/ipv4/gre_demux.c
@@ -117,6 +117,7 @@ int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi,
if ((*(u8 *)options & 0xF0) != 0x40)
hdr_len += 4;
}
+ tpi->hdr_len = hdr_len;
return hdr_len;
}
EXPORT_SYMBOL(gre_parse_header);