Skip to content

Commit 5e9f8e2

Browse files
committed
netfilter: nftables: rename set element data activation/deactivation functions
jira VUlN-429 subsystem-sync netfilter:nf_tables 4.18.0-511 commit-author Pablo Neira Ayuso <[email protected]> commit f8bb788 Rename: - nft_set_elem_activate() to nft_set_elem_data_activate(). - nft_set_elem_deactivate() to nft_set_elem_data_deactivate(). To prepare for updates in the set element infrastructure to add support for the special catch-all element. Signed-off-by: Pablo Neira Ayuso <[email protected]> (cherry picked from commit f8bb788) Signed-off-by: Greg Rose <[email protected]>
1 parent bc2590c commit 5e9f8e2

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

net/netfilter/nf_tables_api.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5203,8 +5203,8 @@ void nft_set_elem_destroy(const struct nft_set *set, void *elem,
52035203
}
52045204
EXPORT_SYMBOL_GPL(nft_set_elem_destroy);
52055205

5206-
/* Only called from commit path, nft_set_elem_deactivate() already deals with
5207-
* the refcounting from the preparation phase.
5206+
/* Only called from commit path, nft_setelem_data_deactivate() already deals
5207+
* with the refcounting from the preparation phase.
52085208
*/
52095209
static void nf_tables_set_elem_destroy(const struct nft_ctx *ctx,
52105210
const struct nft_set *set, void *elem)
@@ -5733,9 +5733,9 @@ void nft_data_hold(const struct nft_data *data, enum nft_data_types type)
57335733
}
57345734
}
57355735

5736-
static void nft_set_elem_activate(const struct net *net,
5737-
const struct nft_set *set,
5738-
struct nft_set_elem *elem)
5736+
static void nft_setelem_data_activate(const struct net *net,
5737+
const struct nft_set *set,
5738+
struct nft_set_elem *elem)
57395739
{
57405740
const struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv);
57415741

@@ -5745,9 +5745,9 @@ static void nft_set_elem_activate(const struct net *net,
57455745
nft_use_inc_restore(&(*nft_set_ext_obj(ext))->use);
57465746
}
57475747

5748-
static void nft_set_elem_deactivate(const struct net *net,
5749-
const struct nft_set *set,
5750-
struct nft_set_elem *elem)
5748+
static void nft_setelem_data_deactivate(const struct net *net,
5749+
const struct nft_set *set,
5750+
struct nft_set_elem *elem)
57515751
{
57525752
const struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv);
57535753

@@ -5834,7 +5834,7 @@ static int nft_del_setelem(struct nft_ctx *ctx, struct nft_set *set,
58345834
kfree(elem.priv);
58355835
elem.priv = priv;
58365836

5837-
nft_set_elem_deactivate(ctx->net, set, &elem);
5837+
nft_setelem_data_deactivate(ctx->net, set, &elem);
58385838

58395839
nft_trans_elem(trans) = elem;
58405840
list_add_tail(&trans->list, &ctx->net->nft.commit_list);
@@ -5870,7 +5870,7 @@ static int nft_flush_set(const struct nft_ctx *ctx,
58705870
}
58715871
set->ndeact++;
58725872

5873-
nft_set_elem_deactivate(ctx->net, set, elem);
5873+
nft_setelem_data_deactivate(ctx->net, set, elem);
58745874
nft_trans_elem_set(trans) = set;
58755875
nft_trans_elem(trans) = *elem;
58765876
list_add_tail(&trans->list, &ctx->net->nft.commit_list);
@@ -8328,7 +8328,7 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)
83288328
case NFT_MSG_DELSETELEM:
83298329
te = (struct nft_trans_elem *)trans->data;
83308330

8331-
nft_set_elem_activate(net, te->set, &te->elem);
8331+
nft_setelem_data_activate(net, te->set, &te->elem);
83328332
te->set->ops->activate(net, te->set, &te->elem);
83338333
te->set->ndeact--;
83348334

0 commit comments

Comments
 (0)