kernel: Bump to 4.14.302

[librecmc/librecmc.git] / target / linux / generic / backport-4.14 / 306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch

diff --git a/target/linux/generic/backport-4.14/306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch b/target/linux/generic/backport-4.14/306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch
index c699c3aae3074803baf39fb26f4177064f77ac47..53ba68c45afb95640c56cde78b89288e2a304ad0 100644 (file)
--- a/target/linux/generic/backport-4.14/306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch
+++ b/target/linux/generic/backport-4.14/306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch
@@ -176,7 +176,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  #include <linux/netfilter_bridge.h>
  #include <linux/seq_file.h>
  #include <linux/rcupdate.h>
-@@ -121,6 +123,35 @@ void nf_queue_nf_hook_drop(struct net *n
+@@ -119,6 +121,35 @@ void nf_queue_nf_hook_drop(struct net *n
  }
  EXPORT_SYMBOL_GPL(nf_queue_nf_hook_drop);
  
@@ -212,7 +212,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  static int __nf_queue(struct sk_buff *skb, const struct nf_hook_state *state,
                      const struct nf_hook_entries *entries,
                      unsigned int index, unsigned int queuenum)
-@@ -165,7 +196,15 @@ static int __nf_queue(struct sk_buff *sk
+@@ -163,7 +194,15 @@ static int __nf_queue(struct sk_buff *sk
                return -ENOTCONN;
        }