Commit f75edf5e authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso

netfilter: nf_tables: disabling table hooks always succeeds

nf_tables_table_disable() always succeeds, make this function void.
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 91c7b38d
...@@ -381,7 +381,7 @@ static int nf_tables_table_enable(const struct nft_af_info *afi, ...@@ -381,7 +381,7 @@ static int nf_tables_table_enable(const struct nft_af_info *afi,
return err; return err;
} }
static int nf_tables_table_disable(const struct nft_af_info *afi, static void nf_tables_table_disable(const struct nft_af_info *afi,
struct nft_table *table) struct nft_table *table)
{ {
struct nft_chain *chain; struct nft_chain *chain;
...@@ -391,8 +391,6 @@ static int nf_tables_table_disable(const struct nft_af_info *afi, ...@@ -391,8 +391,6 @@ static int nf_tables_table_disable(const struct nft_af_info *afi,
nf_unregister_hooks(nft_base_chain(chain)->ops, nf_unregister_hooks(nft_base_chain(chain)->ops,
afi->nops); afi->nops);
} }
return 0;
} }
static int nf_tables_updtable(struct sock *nlsk, struct sk_buff *skb, static int nf_tables_updtable(struct sock *nlsk, struct sk_buff *skb,
...@@ -412,9 +410,8 @@ static int nf_tables_updtable(struct sock *nlsk, struct sk_buff *skb, ...@@ -412,9 +410,8 @@ static int nf_tables_updtable(struct sock *nlsk, struct sk_buff *skb,
if ((flags & NFT_TABLE_F_DORMANT) && if ((flags & NFT_TABLE_F_DORMANT) &&
!(table->flags & NFT_TABLE_F_DORMANT)) { !(table->flags & NFT_TABLE_F_DORMANT)) {
ret = nf_tables_table_disable(afi, table); nf_tables_table_disable(afi, table);
if (ret >= 0) table->flags |= NFT_TABLE_F_DORMANT;
table->flags |= NFT_TABLE_F_DORMANT;
} else if (!(flags & NFT_TABLE_F_DORMANT) && } else if (!(flags & NFT_TABLE_F_DORMANT) &&
table->flags & NFT_TABLE_F_DORMANT) { table->flags & NFT_TABLE_F_DORMANT) {
ret = nf_tables_table_enable(afi, table); ret = nf_tables_table_enable(afi, table);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment