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 8595392e4a8cc3662afc3298d37e800a04b37203..fe13d039fa31b0bdda7d24ec729026d559d15272 100644 (file)
--- 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 <u9012063@gmail.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- 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);