diff options
| author | John Audia <therealgraysky@proton.me> | 2022-08-25 10:52:50 -0400 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2022-08-28 07:24:59 +0200 |
| commit | 89956c65325260c3d7130aa48b8284c786661e18 (patch) | |
| tree | 2ce4834dda40927a7e451203e9ea93f59844c92a /target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch | |
| parent | 4209c33ae27d6bb53722e79d7c1a696ea02e25ad (diff) | |
| download | upstream-89956c65325260c3d7130aa48b8284c786661e18.tar.gz upstream-89956c65325260c3d7130aa48b8284c786661e18.tar.bz2 upstream-89956c65325260c3d7130aa48b8284c786661e18.zip | |
kernel: bump 5.10 to 5.10.138
All patches automatically rebased.
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit fc89ec06928469021010c2f5776450f739af07a5)
Diffstat (limited to 'target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch')
| -rw-r--r-- | target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch b/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch index 5ab2718ecb..eea0aed6aa 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch @@ -34,7 +34,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> struct nft_set *set; --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -893,6 +893,12 @@ static void nf_tables_table_disable(stru +@@ -917,6 +917,12 @@ static void nf_tables_table_disable(stru nft_table_disable(net, table, 0); } @@ -47,7 +47,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> static int nf_tables_updtable(struct nft_ctx *ctx) { struct nft_trans *trans; -@@ -916,19 +922,17 @@ static int nf_tables_updtable(struct nft +@@ -940,19 +946,17 @@ static int nf_tables_updtable(struct nft if ((flags & NFT_TABLE_F_DORMANT) && !(ctx->table->flags & NFT_TABLE_F_DORMANT)) { @@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> nft_trans_table_update(trans) = true; list_add_tail(&trans->list, &ctx->net->nft.commit_list); return 0; -@@ -7931,11 +7935,10 @@ static int nf_tables_commit(struct net * +@@ -7929,11 +7933,10 @@ static int nf_tables_commit(struct net * switch (trans->msg_type) { case NFT_MSG_NEWTABLE: if (nft_trans_table_update(trans)) { @@ -86,7 +86,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> } else { nft_clear(net, trans->ctx.table); } -@@ -8148,11 +8151,9 @@ static int __nf_tables_abort(struct net +@@ -8147,11 +8150,9 @@ static int __nf_tables_abort(struct net switch (trans->msg_type) { case NFT_MSG_NEWTABLE: if (nft_trans_table_update(trans)) { |