kernel: bump 4.14 to 4.14.129

[openwrt/staging/chunkeey.git] / target / linux / generic / backport-4.14 / 308-v4.16-netfilter-move-reroute-indirection-to-struct-nf_ipv6.patch

diff --git a/target/linux/generic/backport-4.14/308-v4.16-netfilter-move-reroute-indirection-to-struct-nf_ipv6.patch b/target/linux/generic/backport-4.14/308-v4.16-netfilter-move-reroute-indirection-to-struct-nf_ipv6.patch
index 6e9413e511fdf35ab44686d1dda8e820a9e020a3..9303a0b777b6c029c1c577813b0a94f8e3f50696 100644 (file)
--- a/target/linux/generic/backport-4.14/308-v4.16-netfilter-move-reroute-indirection-to-struct-nf_ipv6.patch
+++ b/target/linux/generic/backport-4.14/308-v4.16-netfilter-move-reroute-indirection-to-struct-nf_ipv6.patch
@@ -171,7 +171,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  
 --- a/net/netfilter/nf_queue.c
 +++ b/net/netfilter/nf_queue.c
  
 --- a/net/netfilter/nf_queue.c
 +++ b/net/netfilter/nf_queue.c

-@@ -266,7 +266,6 @@ void nf_reinject(struct nf_queue_entry *
+@@ -267,7 +267,6 @@ void nf_reinject(struct nf_queue_entry *

        const struct nf_hook_entry *hook_entry;
        const struct nf_hook_entries *hooks;
        struct sk_buff *skb = entry->skb;
        const struct nf_hook_entry *hook_entry;
        const struct nf_hook_entries *hooks;
        struct sk_buff *skb = entry->skb;


@@ -179,7 +179,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
        const struct net *net;
        unsigned int i;
        int err;
        const struct net *net;
        unsigned int i;
        int err;

-@@ -293,8 +292,7 @@ void nf_reinject(struct nf_queue_entry *
+@@ -294,8 +293,7 @@ void nf_reinject(struct nf_queue_entry *

                verdict = nf_hook_entry_hookfn(hook_entry, skb, &entry->state);
  
        if (verdict == NF_ACCEPT) {
                verdict = nf_hook_entry_hookfn(hook_entry, skb, &entry->state);
  
        if (verdict == NF_ACCEPT) {