ramips: drop support for kernel 4.14
[openwrt/openwrt.git] / target / linux / generic / backport-4.14 / 301-v4.16-netfilter-core-only-allow-one-nat-hook-per-hook-poin.patch
index 711eca0352ffca6d9234a881c7ec9522b9113f72..80fd3678af8aa4f4a8d5e9dbfef90c0b45e62aa3 100644 (file)
@@ -120,7 +120,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
                .priority       = NF_IP6_PRI_NAT_SRC,
 --- a/net/netfilter/core.c
 +++ b/net/netfilter/core.c
-@@ -135,6 +135,12 @@ nf_hook_entries_grow(const struct nf_hoo
+@@ -160,6 +160,12 @@ nf_hook_entries_grow(const struct nf_hoo
                        ++i;
                        continue;
                }
@@ -135,7 +135,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
                        new->hooks[nhooks] = old->hooks[i];
 --- a/net/netfilter/nf_tables_api.c
 +++ b/net/netfilter/nf_tables_api.c
-@@ -1400,6 +1400,8 @@ static int nf_tables_addchain(struct nft
+@@ -1446,6 +1446,8 @@ static int nf_tables_addchain(struct nft
                                ops->hook = hookfn;
                        if (afi->hook_ops_init)
                                afi->hook_ops_init(ops, i);