|
@@ -34,7 +34,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
|
|
|
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 <[email protected]>
|
|
|
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 <[email protected]>
|
|
|
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 <[email protected]>
|
|
|
} 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)) {
|