tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Patrick McHardy <kaber@trash.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

authored by

Patrick McHardy and committed by
Pablo Neira Ayuso 3876d22d 44a6f0df

+12 -12
+2 -2
include/net/netfilter/nf_tables.h
··· 447 447 return container_of(chain, struct nft_base_chain, chain); 448 448 } 449 449 450 - unsigned int nft_do_chain_pktinfo(struct nft_pktinfo *pkt, 451 - const struct nf_hook_ops *ops); 450 + unsigned int nft_do_chain(struct nft_pktinfo *pkt, 451 + const struct nf_hook_ops *ops); 452 452 453 453 /** 454 454 * struct nft_table - nf_tables table
+1 -1
net/bridge/netfilter/nf_tables_bridge.c
··· 25 25 26 26 nft_set_pktinfo(&pkt, ops, skb, in, out); 27 27 28 - return nft_do_chain_pktinfo(&pkt, ops); 28 + return nft_do_chain(&pkt, ops); 29 29 } 30 30 31 31 static struct nft_af_info nft_af_bridge __read_mostly = {
+1 -1
net/ipv4/netfilter/nf_tables_arp.c
··· 25 25 26 26 nft_set_pktinfo(&pkt, ops, skb, in, out); 27 27 28 - return nft_do_chain_pktinfo(&pkt, ops); 28 + return nft_do_chain(&pkt, ops); 29 29 } 30 30 31 31 static struct nft_af_info nft_af_arp __read_mostly = {
+1 -1
net/ipv4/netfilter/nf_tables_ipv4.c
··· 28 28 29 29 nft_set_pktinfo_ipv4(&pkt, ops, skb, in, out); 30 30 31 - return nft_do_chain_pktinfo(&pkt, ops); 31 + return nft_do_chain(&pkt, ops); 32 32 } 33 33 34 34 static unsigned int nft_ipv4_output(const struct nf_hook_ops *ops,
+1 -1
net/ipv4/netfilter/nft_chain_nat_ipv4.c
··· 75 75 76 76 nft_set_pktinfo_ipv4(&pkt, ops, skb, in, out); 77 77 78 - ret = nft_do_chain_pktinfo(&pkt, ops); 78 + ret = nft_do_chain(&pkt, ops); 79 79 if (ret != NF_ACCEPT) 80 80 return ret; 81 81 if (!nf_nat_initialized(ct, maniptype)) {
+1 -1
net/ipv4/netfilter/nft_chain_route_ipv4.c
··· 47 47 daddr = iph->daddr; 48 48 tos = iph->tos; 49 49 50 - ret = nft_do_chain_pktinfo(&pkt, ops); 50 + ret = nft_do_chain(&pkt, ops); 51 51 if (ret != NF_DROP && ret != NF_QUEUE) { 52 52 iph = ip_hdr(skb); 53 53
+1 -1
net/ipv6/netfilter/nf_tables_ipv6.c
··· 28 28 if (nft_set_pktinfo_ipv6(&pkt, ops, skb, in, out) < 0) 29 29 return NF_DROP; 30 30 31 - return nft_do_chain_pktinfo(&pkt, ops); 31 + return nft_do_chain(&pkt, ops); 32 32 } 33 33 34 34 static unsigned int nft_ipv6_output(const struct nf_hook_ops *ops,
+1 -1
net/ipv6/netfilter/nft_chain_nat_ipv6.c
··· 79 79 80 80 nft_set_pktinfo_ipv6(&pkt, ops, skb, in, out); 81 81 82 - ret = nft_do_chain_pktinfo(&pkt, ops); 82 + ret = nft_do_chain(&pkt, ops); 83 83 if (ret != NF_ACCEPT) 84 84 return ret; 85 85 if (!nf_nat_initialized(ct, maniptype)) {
+1 -1
net/ipv6/netfilter/nft_chain_route_ipv6.c
··· 47 47 /* flowlabel and prio (includes version, which shouldn't change either */ 48 48 flowlabel = *((u32 *)ipv6_hdr(skb)); 49 49 50 - ret = nft_do_chain_pktinfo(&pkt, ops); 50 + ret = nft_do_chain(&pkt, ops); 51 51 if (ret != NF_DROP && ret != NF_QUEUE && 52 52 (memcmp(&ipv6_hdr(skb)->saddr, &saddr, sizeof(saddr)) || 53 53 memcmp(&ipv6_hdr(skb)->daddr, &daddr, sizeof(daddr)) ||
+2 -2
net/netfilter/nf_tables_core.c
··· 116 116 } 117 117 118 118 unsigned int 119 - nft_do_chain_pktinfo(struct nft_pktinfo *pkt, const struct nf_hook_ops *ops) 119 + nft_do_chain(struct nft_pktinfo *pkt, const struct nf_hook_ops *ops) 120 120 { 121 121 const struct nft_chain *chain = ops->priv; 122 122 const struct nft_rule *rule; ··· 216 216 217 217 return nft_base_chain(chain)->policy; 218 218 } 219 - EXPORT_SYMBOL_GPL(nft_do_chain_pktinfo); 219 + EXPORT_SYMBOL_GPL(nft_do_chain); 220 220 221 221 int __init nf_tables_core_module_init(void) 222 222 {