diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-01-14 14:39:40 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-01-20 13:41:49 +0100 |
| commit | b5480de4d1527216cdc3719670a203fb05e72e88 (patch) | |
| tree | 7e55c641063cb246c87a7f5fa6036c238323dcf2 /target/linux/generic/backport-4.14/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch | |
| parent | 098cbc68ee23db589ed6f0d081fe26cc385462f2 (diff) | |
| download | upstream-b5480de4d1527216cdc3719670a203fb05e72e88.tar.gz upstream-b5480de4d1527216cdc3719670a203fb05e72e88.tar.bz2 upstream-b5480de4d1527216cdc3719670a203fb05e72e88.zip | |
kernel: bump 4.14 to 4.14.164
Refreshed all patches.
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
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 | 4 |
1 files changed, 2 insertions, 2 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 925a4739ed..f7e7eeaa05 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 @@ -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; -@@ -5813,7 +5806,6 @@ static int nf_tables_commit(struct net * +@@ -5819,7 +5812,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; } -@@ -5977,7 +5969,6 @@ static int nf_tables_abort(struct net *n +@@ -5983,7 +5975,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, |