kernel: bump 4.14 to 4.14.120

[openwrt/staging/dedeckeh.git] / target / linux / generic / backport-4.14 / 301-v4.16-netfilter-core-only-allow-one-nat-hook-per-hook-poin.patch

diff --git a/target/linux/generic/backport-4.14/301-v4.16-netfilter-core-only-allow-one-nat-hook-per-hook-poin.patch b/target/linux/generic/backport-4.14/301-v4.16-netfilter-core-only-allow-one-nat-hook-per-hook-poin.patch
index cd54aa01141464a86fb178582b254adebd0150e0..80fd3678af8aa4f4a8d5e9dbfef90c0b45e62aa3 100644 (file)
--- a/target/linux/generic/backport-4.14/301-v4.16-netfilter-core-only-allow-one-nat-hook-per-hook-poin.patch
+++ b/target/linux/generic/backport-4.14/301-v4.16-netfilter-core-only-allow-one-nat-hook-per-hook-poin.patch
@@ -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
-@@ -1434,6 +1434,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);