diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-27 17:07:48 +0100 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-03-05 13:19:43 +0100 |
commit | 1cfbf95393decf047900e1b66b076a030704db20 (patch) | |
tree | 8087326ea9c0d8885763999944c258fdd5b742f4 /target/linux/generic/backport-4.14/332-v4.16-netfilter-nf_tables-remove-struct-nft_af_info-parame.patch | |
parent | fc45ae44613b41f7328e81d0999f609dd7e81482 (diff) | |
download | upstream-1cfbf95393decf047900e1b66b076a030704db20.tar.gz upstream-1cfbf95393decf047900e1b66b076a030704db20.tar.bz2 upstream-1cfbf95393decf047900e1b66b076a030704db20.zip |
kernel: bump 4.14 to 4.14.104
Refreshed all patches.
Altered patches:
- 332-arc-add-OWRTDTB-section.patch
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14/332-v4.16-netfilter-nf_tables-remove-struct-nft_af_info-parame.patch')
-rw-r--r-- | target/linux/generic/backport-4.14/332-v4.16-netfilter-nf_tables-remove-struct-nft_af_info-parame.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 086178ae20..4875dbb0d3 100644 --- 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 -@@ -452,7 +452,7 @@ static inline u64 nf_tables_alloc_handle +@@ -455,7 +455,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; -@@ -465,22 +465,20 @@ __nf_tables_chain_type_lookup(int family +@@ -468,22 +468,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); } -@@ -1356,8 +1354,8 @@ static int nft_chain_parse_hook(struct n +@@ -1359,8 +1357,8 @@ static int nft_chain_parse_hook(struct n type = chain_type[afi->family][NFT_CHAIN_T_DEFAULT]; if (nla[NFTA_CHAIN_TYPE]) { |