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

Commit 3876d22d authored by Patrick McHardy's avatar Patrick McHardy Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_tables: rename nft_do_chain_pktinfo() to nft_do_chain() 



We don't encode argument types into function names and since besides
nft_do_chain() there are only AF-specific versions, there is no risk
of confusion.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 44a6f0df

include/net/netfilter/nf_tables.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -447,7 +447,7 @@ static inline struct nft_base_chain *nft_base_chain(const struct nft_chain *chai 
	return container_of(chain, struct nft_base_chain, chain);

	return container_of(chain, struct nft_base_chain, chain);

}

}





unsigned int nft_do_chain_pktinfo(struct nft_pktinfo *pkt,

unsigned int nft_do_chain(struct nft_pktinfo *pkt,

			  const struct nf_hook_ops *ops);

			  const struct nf_hook_ops *ops);





/**

/**

net/bridge/netfilter/nf_tables_bridge.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ nft_do_chain_bridge(const struct nf_hook_ops *ops, 




	nft_set_pktinfo(&pkt, ops, skb, in, out);

	nft_set_pktinfo(&pkt, ops, skb, in, out);





	return nft_do_chain_pktinfo(&pkt, ops);

	return nft_do_chain(&pkt, ops);

}

}





static struct nft_af_info nft_af_bridge __read_mostly = {

static struct nft_af_info nft_af_bridge __read_mostly = {

net/ipv4/netfilter/nf_tables_arp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ nft_do_chain_arp(const struct nf_hook_ops *ops, 




	nft_set_pktinfo(&pkt, ops, skb, in, out);

	nft_set_pktinfo(&pkt, ops, skb, in, out);





	return nft_do_chain_pktinfo(&pkt, ops);

	return nft_do_chain(&pkt, ops);

}

}





static struct nft_af_info nft_af_arp __read_mostly = {

static struct nft_af_info nft_af_arp __read_mostly = {

net/ipv4/netfilter/nf_tables_ipv4.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ static unsigned int nft_do_chain_ipv4(const struct nf_hook_ops *ops, 




	nft_set_pktinfo_ipv4(&pkt, ops, skb, in, out);

	nft_set_pktinfo_ipv4(&pkt, ops, skb, in, out);





	return nft_do_chain_pktinfo(&pkt, ops);

	return nft_do_chain(&pkt, ops);

}

}





static unsigned int nft_ipv4_output(const struct nf_hook_ops *ops,

static unsigned int nft_ipv4_output(const struct nf_hook_ops *ops,

net/ipv4/netfilter/nft_chain_nat_ipv4.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -75,7 +75,7 @@ static unsigned int nf_nat_fn(const struct nf_hook_ops *ops, 




		nft_set_pktinfo_ipv4(&pkt, ops, skb, in, out);

		nft_set_pktinfo_ipv4(&pkt, ops, skb, in, out);





		ret = nft_do_chain_pktinfo(&pkt, ops);

		ret = nft_do_chain(&pkt, ops);

		if (ret != NF_ACCEPT)

		if (ret != NF_ACCEPT)

			return ret;

			return ret;

		if (!nf_nat_initialized(ct, maniptype)) {

		if (!nf_nat_initialized(ct, maniptype)) {