kernel: bump 4.14 to 4.14.120

[openwrt/staging/dedeckeh.git] / target / linux / generic / backport-4.14 / 332-v4.16-netfilter-nf_tables-remove-struct-nft_af_info-parame.patch

diff --git a/target/linux/generic/backport-4.14/332-v4.16-netfilter-nf_tables-remove-struct-nft_af_info-parame.patch b/target/linux/generic/backport-4.14/332-v4.16-netfilter-nf_tables-remove-struct-nft_af_info-parame.patch
index 4875dbb0d367eddfc92d7cd957d79cb8b580c33a..0ce65dc14143e3d1fc5b71b630cdaa8a0a1fedfc 100644 (file)
--- a/target/linux/generic/backport-4.14/332-v4.16-netfilter-nf_tables-remove-struct-nft_af_info-parame.patch
+++ b/target/linux/generic/backport-4.14/332-v4.16-netfilter-nf_tables-remove-struct-nft_af_info-parame.patch
@@ -11,7 +11,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 
 --- a/net/netfilter/nf_tables_api.c
 +++ b/net/netfilter/nf_tables_api.c
-@@ -455,7 +455,7 @@ static inline u64 nf_tables_alloc_handle
+@@ -467,7 +467,7 @@ static inline u64 nf_tables_alloc_handle
  static const struct nf_chain_type *chain_type[NFPROTO_NUMPROTO][NFT_CHAIN_T_MAX];
  
  static const struct nf_chain_type *
@@ -20,7 +20,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  {
        int i;
  
-@@ -468,22 +468,20 @@ __nf_tables_chain_type_lookup(int family
+@@ -480,22 +480,20 @@ __nf_tables_chain_type_lookup(int family
  }
  
  static const struct nf_chain_type *
@@ -47,7 +47,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
                if (type != NULL)
                        return ERR_PTR(-EAGAIN);
        }
-@@ -1359,8 +1357,8 @@ static int nft_chain_parse_hook(struct n
+@@ -1371,8 +1369,8 @@ static int nft_chain_parse_hook(struct n
  
        type = chain_type[afi->family][NFT_CHAIN_T_DEFAULT];
        if (nla[NFTA_CHAIN_TYPE]) {