Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28ca0533 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Lee Jones
Browse files

UPSTREAM: netfilter: nftables: rename set element data activation/deactivation functions 



commit f8bb7889af58d8e74d2d61c76b1418230f1610fa upstream.

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.

Bug: 299922216
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 6b880f3b)
Signed-off-by: default avatarLee Jones <joneslee@google.com>
Change-Id: I6411a3604194564f35dd7d59b7b6da1e40a9bbe4
parent e85a3e2c

net/netfilter/nf_tables_api.c

+11 −11
Original line number Original line Diff line number Diff line
@@ -4606,8 +4606,8 @@ void nft_set_elem_destroy(const struct nft_set *set, void *elem, 
}

}

EXPORT_SYMBOL_GPL(nft_set_elem_destroy);

EXPORT_SYMBOL_GPL(nft_set_elem_destroy);





/* Only called from commit path, nft_set_elem_deactivate() already deals with

/* Only called from commit path, nft_setelem_data_deactivate() already deals

 * the refcounting from the preparation phase.

 * with the refcounting from the preparation phase.

 */

 */

static void nf_tables_set_elem_destroy(const struct nft_ctx *ctx,

static void nf_tables_set_elem_destroy(const struct nft_ctx *ctx,

				       const struct nft_set *set, void *elem)

				       const struct nft_set *set, void *elem)
@@ -4923,7 +4923,7 @@ void nft_data_hold(const struct nft_data *data, enum nft_data_types type) 
	}

	}

}

}





static void nft_set_elem_activate(const struct net *net,

static void nft_setelem_data_activate(const struct net *net,

				      const struct nft_set *set,

				      const struct nft_set *set,

				      struct nft_set_elem *elem)

				      struct nft_set_elem *elem)

{

{
@@ -4935,7 +4935,7 @@ static void nft_set_elem_activate(const struct net *net, 
		nft_use_inc_restore(&(*nft_set_ext_obj(ext))->use);

		nft_use_inc_restore(&(*nft_set_ext_obj(ext))->use);

}

}





static void nft_set_elem_deactivate(const struct net *net,

static void nft_setelem_data_deactivate(const struct net *net,

					const struct nft_set *set,

					const struct nft_set *set,

					struct nft_set_elem *elem)

					struct nft_set_elem *elem)

{

{
@@ -5004,7 +5004,7 @@ static int nft_del_setelem(struct nft_ctx *ctx, struct nft_set *set, 
	kfree(elem.priv);

	kfree(elem.priv);

	elem.priv = priv;

	elem.priv = priv;





	nft_set_elem_deactivate(ctx->net, set, &elem);

	nft_setelem_data_deactivate(ctx->net, set, &elem);





	nft_trans_elem(trans) = elem;

	nft_trans_elem(trans) = elem;

	nft_trans_commit_list_add_tail(ctx->net, trans);

	nft_trans_commit_list_add_tail(ctx->net, trans);
@@ -5038,7 +5038,7 @@ static int nft_flush_set(const struct nft_ctx *ctx, 
	}

	}

	set->ndeact++;

	set->ndeact++;





	nft_set_elem_deactivate(ctx->net, set, elem);

	nft_setelem_data_deactivate(ctx->net, set, elem);

	nft_trans_elem_set(trans) = set;

	nft_trans_elem_set(trans) = set;

	nft_trans_elem(trans) = *elem;

	nft_trans_elem(trans) = *elem;

	nft_trans_commit_list_add_tail(ctx->net, trans);

	nft_trans_commit_list_add_tail(ctx->net, trans);
@@ -7279,7 +7279,7 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action) 
		case NFT_MSG_DELSETELEM:

		case NFT_MSG_DELSETELEM:

			te = (struct nft_trans_elem *)trans->data;

			te = (struct nft_trans_elem *)trans->data;





			nft_set_elem_activate(net, te->set, &te->elem);

			nft_setelem_data_activate(net, te->set, &te->elem);

			te->set->ops->activate(net, te->set, &te->elem);

			te->set->ops->activate(net, te->set, &te->elem);

			te->set->ndeact--;

			te->set->ndeact--;