kernel: bump 4.14 to 4.14.120

[openwrt/staging/dedeckeh.git] / target / linux / generic / backport-4.14 / 312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch

diff --git a/target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch b/target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch
index f4c3a48ead94f2af1e1196f00d63bf51eb2a9c21..8f7d11bd679bb03949f5b16637cf61ac4417e5e1 100644 (file)
--- a/target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch
+++ b/target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch
@@ -151,7 +151,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  static int __init nf_tables_ipv6_init(void)
 --- a/net/netfilter/nf_tables_api.c
 +++ b/net/netfilter/nf_tables_api.c
-@@ -1386,7 +1386,6 @@ static int nf_tables_addchain(struct nft
+@@ -1398,7 +1398,6 @@ static int nf_tables_addchain(struct nft
        if (nla[NFTA_CHAIN_HOOK]) {
                struct nft_chain_hook hook;
                struct nf_hook_ops *ops;
@@ -159,7 +159,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  
                err = nft_chain_parse_hook(net, nla, afi, &hook, create);
                if (err < 0)
-@@ -1412,7 +1411,6 @@ static int nf_tables_addchain(struct nft
+@@ -1424,7 +1423,6 @@ static int nf_tables_addchain(struct nft
                        static_branch_inc(&nft_counters_enabled);
                }
  
@@ -167,7 +167,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
                basechain->type = hook.type;
                chain = &basechain->chain;
  
-@@ -1421,10 +1419,8 @@ static int nf_tables_addchain(struct nft
+@@ -1433,10 +1431,8 @@ static int nf_tables_addchain(struct nft
                ops->hooknum    = hook.num;
                ops->priority   = hook.priority;
                ops->priv       = chain;