You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
81 lines
2.6 KiB
Diff
81 lines
2.6 KiB
Diff
From: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
Date: Tue, 19 Dec 2017 12:17:52 +0100
|
|
Subject: [PATCH] netfilter: nf_tables: no need for struct nft_af_info to
|
|
enable/disable table
|
|
|
|
nf_tables_table_enable() and nf_tables_table_disable() take a pointer to
|
|
struct nft_af_info that is never used, remove it.
|
|
|
|
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
---
|
|
|
|
--- a/net/netfilter/nf_tables_api.c
|
|
+++ b/net/netfilter/nf_tables_api.c
|
|
@@ -655,10 +655,7 @@ err:
|
|
return err;
|
|
}
|
|
|
|
-static void _nf_tables_table_disable(struct net *net,
|
|
- const struct nft_af_info *afi,
|
|
- struct nft_table *table,
|
|
- u32 cnt)
|
|
+static void nft_table_disable(struct net *net, struct nft_table *table, u32 cnt)
|
|
{
|
|
struct nft_chain *chain;
|
|
u32 i = 0;
|
|
@@ -676,9 +673,7 @@ static void _nf_tables_table_disable(str
|
|
}
|
|
}
|
|
|
|
-static int nf_tables_table_enable(struct net *net,
|
|
- const struct nft_af_info *afi,
|
|
- struct nft_table *table)
|
|
+static int nf_tables_table_enable(struct net *net, struct nft_table *table)
|
|
{
|
|
struct nft_chain *chain;
|
|
int err, i = 0;
|
|
@@ -698,15 +693,13 @@ static int nf_tables_table_enable(struct
|
|
return 0;
|
|
err:
|
|
if (i)
|
|
- _nf_tables_table_disable(net, afi, table, i);
|
|
+ nft_table_disable(net, table, i);
|
|
return err;
|
|
}
|
|
|
|
-static void nf_tables_table_disable(struct net *net,
|
|
- const struct nft_af_info *afi,
|
|
- struct nft_table *table)
|
|
+static void nf_tables_table_disable(struct net *net, struct nft_table *table)
|
|
{
|
|
- _nf_tables_table_disable(net, afi, table, 0);
|
|
+ nft_table_disable(net, table, 0);
|
|
}
|
|
|
|
static int nf_tables_updtable(struct nft_ctx *ctx)
|
|
@@ -735,7 +728,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) {
|
|
- ret = nf_tables_table_enable(ctx->net, ctx->afi, ctx->table);
|
|
+ ret = nf_tables_table_enable(ctx->net, ctx->table);
|
|
if (ret >= 0) {
|
|
ctx->table->flags &= ~NFT_TABLE_F_DORMANT;
|
|
nft_trans_table_enable(trans) = true;
|
|
@@ -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,
|
|
- trans->ctx.afi,
|
|
trans->ctx.table);
|
|
trans->ctx.table->flags |= NFT_TABLE_F_DORMANT;
|
|
}
|
|
@@ -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,
|
|
- trans->ctx.afi,
|
|
trans->ctx.table);
|
|
trans->ctx.table->flags |= NFT_TABLE_F_DORMANT;
|
|
}
|