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 cd6906634ed9c0ca20d9bb913b332095d07ec048..b93e903427d70c248955a998eb56c7e9bf143e00 100644 (file)
--- 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;
        }