diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-07-10 11:52:53 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-07-11 16:02:24 +0200 |
| commit | ba2b0f0ac6de840ed5eefdf1e32d28bb2d00fbb3 (patch) | |
| tree | 08147ff780b67b82254ce61f88aa34410b142899 /target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch | |
| parent | 954faac7bc1dd34047bc4132cd28a96089fcce4e (diff) | |
| download | upstream-ba2b0f0ac6de840ed5eefdf1e32d28bb2d00fbb3.tar.gz upstream-ba2b0f0ac6de840ed5eefdf1e32d28bb2d00fbb3.tar.bz2 upstream-ba2b0f0ac6de840ed5eefdf1e32d28bb2d00fbb3.zip | |
kernel: bump 4.14 to 4.14.54
Rereshed all patches
Reworked patches to match upstream:
335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch
Compile-tested on: cns3xxx, imx6, x86_64
Runtime-tested on: cns3xxx, imx6, x86_64
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch')
| -rw-r--r-- | target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch b/target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch index d1b12ad0d1..307749763a 100644 --- a/target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch +++ b/target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch @@ -14,7 +14,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- a/include/net/netfilter/nf_tables.h +++ b/include/net/netfilter/nf_tables.h -@@ -963,7 +963,6 @@ enum nft_af_flags { +@@ -968,7 +968,6 @@ enum nft_af_flags { * * @list: used internally * @family: address family @@ -22,7 +22,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> * @owner: module owner * @tables: used internally * @flags: family flags -@@ -971,7 +970,6 @@ enum nft_af_flags { +@@ -976,7 +975,6 @@ enum nft_af_flags { struct nft_af_info { struct list_head list; int family; @@ -72,7 +72,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -1328,9 +1328,6 @@ static int nft_chain_parse_hook(struct n +@@ -1359,9 +1359,6 @@ static int nft_chain_parse_hook(struct n return -EINVAL; hook->num = ntohl(nla_get_be32(ha[NFTA_HOOK_HOOKNUM])); @@ -82,7 +82,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> hook->priority = ntohl(nla_get_be32(ha[NFTA_HOOK_PRIORITY])); type = chain_type[afi->family][NFT_CHAIN_T_DEFAULT]; -@@ -4926,7 +4923,7 @@ static int nf_tables_flowtable_parse_hoo +@@ -4969,7 +4966,7 @@ static int nf_tables_flowtable_parse_hoo return -EINVAL; hooknum = ntohl(nla_get_be32(tb[NFTA_FLOWTABLE_HOOK_NUM])); |