From: Greg Kroah-Hartman Date: Thu, 20 Sep 2018 07:04:45 +0000 (+0200) Subject: fix up 4.14 patch X-Git-Tag: v3.18.123~38 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c95513e862649ae022b4f8f9122e249e1e29e7e3;p=thirdparty%2Fkernel%2Fstable-queue.git fix up 4.14 patch --- diff --git a/queue-4.14/erspan-fix-error-handling-for-erspan-tunnel.patch b/queue-4.14/erspan-fix-error-handling-for-erspan-tunnel.patch index 8595392e4a8..fe13d039fa3 100644 --- a/queue-4.14/erspan-fix-error-handling-for-erspan-tunnel.patch +++ b/queue-4.14/erspan-fix-error-handling-for-erspan-tunnel.patch @@ -17,17 +17,16 @@ Acked-by: William Tu Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- - net/ipv4/ip_gre.c | 3 +++ - 1 file changed, 3 insertions(+) + net/ipv4/ip_gre.c | 2 ++ + 1 file changed, 2 insertions(+) --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c -@@ -177,6 +177,9 @@ static void ipgre_err(struct sk_buff *sk +@@ -177,6 +177,8 @@ static void ipgre_err(struct sk_buff *sk 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)) ++ else if (tpi->proto == htons(ETH_P_ERSPAN)) + itn = net_generic(net, erspan_net_id); else itn = net_generic(net, ipgre_net_id);