Commit 51dc63e3 authored Sep 10, 2018 by Haishuang Yan Committed by David S. Miller Sep 11, 2018

erspan: fix error handling for erspan tunnel



When processing icmp unreachable message for erspan tunnel, tunnel id
should be erspan_net_id instead of ipgre_net_id.

Fixes: 84e54fe0 ("gre: introduce native tunnel support for ERSPAN")
Cc: William Tu <u9012063@gmail.com>
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Acked-by: William Tu <u9012063@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 5a64506b

net/ipv4/ip_gre.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -178,6 +178,9 @@ static void ipgre_err(struct sk_buff *skb, u32 info,

		if (tpi->proto == htons(ETH_P_TEB))
		itn = net_generic(net, gre_tap_net_id);
		else if (tpi->proto == htons(ETH_P_ERSPAN) \|\|
		tpi->proto == htons(ETH_P_ERSPAN2))
		itn = net_generic(net, erspan_net_id);
		else
		itn = net_generic(net, ipgre_net_id);

Admin message