kernel : Bump to 4.14.325

[librecmc/librecmc.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 6dad212a869df7209407b4f06fff1a0bdc2521bd..870939728c5dbca04f94680cd195b5a8fd975cc2 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
-@@ -468,7 +468,7 @@ static inline u64 nf_tables_alloc_handle
+@@ -490,7 +490,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;
  
-@@ -481,22 +481,20 @@ __nf_tables_chain_type_lookup(int family
+@@ -503,22 +503,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);
        }
-@@ -1372,8 +1370,8 @@ static int nft_chain_parse_hook(struct n
+@@ -1394,8 +1392,8 @@ static int nft_chain_parse_hook(struct n
  
        type = chain_type[afi->family][NFT_CHAIN_T_DEFAULT];
        if (nla[NFTA_CHAIN_TYPE]) {