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/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.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/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch')
-rw-r--r-- | target/linux/generic/backport-4.14/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/backport-4.14/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch b/target/linux/generic/backport-4.14/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch index b4d0130a78..ce46e69d43 100644 --- a/target/linux/generic/backport-4.14/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch +++ b/target/linux/generic/backport-4.14/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.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 -@@ -611,10 +611,7 @@ err: +@@ -640,10 +640,7 @@ err: return err; } @@ -23,7 +23,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> { struct nft_chain *chain; u32 i = 0; -@@ -632,9 +629,7 @@ static void _nf_tables_table_disable(str +@@ -661,9 +658,7 @@ static void _nf_tables_table_disable(str } } @@ -34,7 +34,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> { struct nft_chain *chain; int err, i = 0; -@@ -654,15 +649,13 @@ static int nf_tables_table_enable(struct +@@ -683,15 +678,13 @@ static int nf_tables_table_enable(struct return 0; err: if (i) @@ -53,7 +53,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> } static int nf_tables_updtable(struct nft_ctx *ctx) -@@ -691,7 +684,7 @@ static int nf_tables_updtable(struct nft +@@ -720,7 +713,7 @@ static int nf_tables_updtable(struct nft nft_trans_table_enable(trans) = false; } else if (!(flags & NFT_TABLE_F_DORMANT) && ctx->table->flags & NFT_TABLE_F_DORMANT) { @@ -62,7 +62,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> if (ret >= 0) { ctx->table->flags &= ~NFT_TABLE_F_DORMANT; nft_trans_table_enable(trans) = true; -@@ -5728,7 +5721,6 @@ static int nf_tables_commit(struct net * +@@ -5771,7 +5764,6 @@ static int nf_tables_commit(struct net * if (nft_trans_table_update(trans)) { if (!nft_trans_table_enable(trans)) { nf_tables_table_disable(net, @@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> trans->ctx.table); trans->ctx.table->flags |= NFT_TABLE_F_DORMANT; } -@@ -5890,7 +5882,6 @@ static int nf_tables_abort(struct net *n +@@ -5933,7 +5925,6 @@ static int nf_tables_abort(struct net *n if (nft_trans_table_update(trans)) { if (nft_trans_table_enable(trans)) { nf_tables_table_disable(net, |