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

Commit 0befd061 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nf_tables: remove nft_dereference() 



This macro is unnecessary, it just hides details for one single caller.
nfnl_dereference() is just enough.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent a7f87b47

include/net/netfilter/nf_tables.h

+0 −3
Original line number Diff line number Diff line
@@ -1113,9 +1113,6 @@ void nft_trace_init(struct nft_traceinfo *info, const struct nft_pktinfo *pkt, 


void nft_trace_notify(struct nft_traceinfo *info);



#define nft_dereference(p)					\

	nfnl_dereference(p, NFNL_SUBSYS_NFTABLES)



#define MODULE_ALIAS_NFT_FAMILY(family)	\

	MODULE_ALIAS("nft-afinfo-" __stringify(family))

net/netfilter/nf_tables_api.c

+3 −3
Original line number Diff line number Diff line
@@ -1222,13 +1222,13 @@ static struct nft_stats __percpu *nft_stats_alloc(const struct nlattr *attr) 
static void nft_chain_stats_replace(struct nft_base_chain *chain,

				    struct nft_stats __percpu *newstats)

{

	struct nft_stats __percpu *oldstats;



	if (newstats == NULL)

		return;



	if (chain->stats) {

		struct nft_stats __percpu *oldstats =

				nft_dereference(chain->stats);



		oldstats = nfnl_dereference(chain->stats, NFNL_SUBSYS_NFTABLES);

		rcu_assign_pointer(chain->stats, newstats);

		synchronize_rcu();

		free_percpu(oldstats);