diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-07-11 14:58:36 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-07-12 13:54:24 +0200 |
| commit | ca903c73c70592fc49649235770fa49823efab96 (patch) | |
| tree | cd9f9fc2eadb0b8ff3aa121c1537753bf7b5a9f0 /target/linux/generic/backport-4.14/330-v4.16-netfilter-nf_tables-remove-flag-field-from-struct-nf.patch | |
| parent | 3a5498c5e55d3fad5df14d94366e331642f0eb77 (diff) | |
| download | upstream-ca903c73c70592fc49649235770fa49823efab96.tar.gz upstream-ca903c73c70592fc49649235770fa49823efab96.tar.bz2 upstream-ca903c73c70592fc49649235770fa49823efab96.zip | |
kernel: bump 4.14 to 4.14.54 for 18.06
Refreshed 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/330-v4.16-netfilter-nf_tables-remove-flag-field-from-struct-nf.patch')
| -rw-r--r-- | target/linux/generic/backport-4.14/330-v4.16-netfilter-nf_tables-remove-flag-field-from-struct-nf.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-4.14/330-v4.16-netfilter-nf_tables-remove-flag-field-from-struct-nf.patch b/target/linux/generic/backport-4.14/330-v4.16-netfilter-nf_tables-remove-flag-field-from-struct-nf.patch index 42aa7b1b0d..c599ad79c2 100644 --- a/target/linux/generic/backport-4.14/330-v4.16-netfilter-nf_tables-remove-flag-field-from-struct-nf.patch +++ b/target/linux/generic/backport-4.14/330-v4.16-netfilter-nf_tables-remove-flag-field-from-struct-nf.patch @@ -10,7 +10,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- a/include/net/netfilter/nf_tables.h +++ b/include/net/netfilter/nf_tables.h -@@ -954,10 +954,6 @@ struct nft_table { +@@ -959,10 +959,6 @@ struct nft_table { char *name; }; @@ -21,7 +21,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> /** * struct nft_af_info - nf_tables address family info * -@@ -965,14 +961,12 @@ enum nft_af_flags { +@@ -970,14 +966,12 @@ enum nft_af_flags { * @family: address family * @owner: module owner * @tables: used internally @@ -38,7 +38,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> int nft_register_afinfo(struct net *, struct nft_af_info *); --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -1345,7 +1345,7 @@ static int nft_chain_parse_hook(struct n +@@ -1376,7 +1376,7 @@ static int nft_chain_parse_hook(struct n hook->type = type; hook->dev = NULL; |