From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 21 Sep 2018 07:25:57 +0000 (+0200)
Subject: 4.14 patch refresh
X-Git-Tag: v3.18.123~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89c6bd024f73679e00092bda077f785c58631f03;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14 patch refresh
---

diff --git a/queue-4.14/erspan-return-packet_reject-when-the-appropriate-tunnel-is-not-found.patch b/queue-4.14/erspan-return-packet_reject-when-the-appropriate-tunnel-is-not-found.patch
index cd6906634ed..b93e903427d 100644
--- a/queue-4.14/erspan-return-packet_reject-when-the-appropriate-tunnel-is-not-found.patch
+++ b/queue-4.14/erspan-return-packet_reject-when-the-appropriate-tunnel-is-not-found.patch
@@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/net/ipv4/ip_gre.c
 +++ b/net/ipv4/ip_gre.c
-@@ -323,6 +323,8 @@ static int erspan_rcv(struct sk_buff *sk
+@@ -322,6 +322,8 @@ static int erspan_rcv(struct sk_buff *sk
  		ip_tunnel_rcv(tunnel, skb, tpi, tun_dst, log_ecn_error);
  		return PACKET_RCVD;
  	}