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

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
...@@ -447,8 +447,8 @@ static inline struct nft_base_chain *nft_base_chain(const struct nft_chain *chai ...@@ -447,8 +447,8 @@ 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);
/** /**
* struct nft_table - nf_tables table * struct nft_table - nf_tables table
......
...@@ -25,7 +25,7 @@ nft_do_chain_bridge(const struct nf_hook_ops *ops, ...@@ -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 = {
......
...@@ -25,7 +25,7 @@ nft_do_chain_arp(const struct nf_hook_ops *ops, ...@@ -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 = {
......
...@@ -28,7 +28,7 @@ static unsigned int nft_do_chain_ipv4(const struct nf_hook_ops *ops, ...@@ -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,
......
...@@ -75,7 +75,7 @@ static unsigned int nf_nat_fn(const struct nf_hook_ops *ops, ...@@ -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)) {
......
...@@ -47,7 +47,7 @@ static unsigned int nf_route_table_hook(const struct nf_hook_ops *ops, ...@@ -47,7 +47,7 @@ static unsigned int nf_route_table_hook(const struct nf_hook_ops *ops,
daddr = iph->daddr; daddr = iph->daddr;
tos = iph->tos; tos = iph->tos;
ret = nft_do_chain_pktinfo(&pkt, ops); ret = nft_do_chain(&pkt, ops);
if (ret != NF_DROP && ret != NF_QUEUE) { if (ret != NF_DROP && ret != NF_QUEUE) {
iph = ip_hdr(skb); iph = ip_hdr(skb);
......
...@@ -28,7 +28,7 @@ static unsigned int nft_do_chain_ipv6(const struct nf_hook_ops *ops, ...@@ -28,7 +28,7 @@ static unsigned int nft_do_chain_ipv6(const struct nf_hook_ops *ops,
if (nft_set_pktinfo_ipv6(&pkt, ops, skb, in, out) < 0) if (nft_set_pktinfo_ipv6(&pkt, ops, skb, in, out) < 0)
return NF_DROP; return NF_DROP;
return nft_do_chain_pktinfo(&pkt, ops); return nft_do_chain(&pkt, ops);
} }
static unsigned int nft_ipv6_output(const struct nf_hook_ops *ops, static unsigned int nft_ipv6_output(const struct nf_hook_ops *ops,
......
...@@ -79,7 +79,7 @@ static unsigned int nf_nat_ipv6_fn(const struct nf_hook_ops *ops, ...@@ -79,7 +79,7 @@ static unsigned int nf_nat_ipv6_fn(const struct nf_hook_ops *ops,
nft_set_pktinfo_ipv6(&pkt, ops, skb, in, out); nft_set_pktinfo_ipv6(&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)) {
......
...@@ -47,7 +47,7 @@ static unsigned int nf_route_table_hook(const struct nf_hook_ops *ops, ...@@ -47,7 +47,7 @@ static unsigned int nf_route_table_hook(const struct nf_hook_ops *ops,
/* flowlabel and prio (includes version, which shouldn't change either */ /* flowlabel and prio (includes version, which shouldn't change either */
flowlabel = *((u32 *)ipv6_hdr(skb)); flowlabel = *((u32 *)ipv6_hdr(skb));
ret = nft_do_chain_pktinfo(&pkt, ops); ret = nft_do_chain(&pkt, ops);
if (ret != NF_DROP && ret != NF_QUEUE && if (ret != NF_DROP && ret != NF_QUEUE &&
(memcmp(&ipv6_hdr(skb)->saddr, &saddr, sizeof(saddr)) || (memcmp(&ipv6_hdr(skb)->saddr, &saddr, sizeof(saddr)) ||
memcmp(&ipv6_hdr(skb)->daddr, &daddr, sizeof(daddr)) || memcmp(&ipv6_hdr(skb)->daddr, &daddr, sizeof(daddr)) ||
......
...@@ -116,7 +116,7 @@ static inline void nft_trace_packet(const struct nft_pktinfo *pkt, ...@@ -116,7 +116,7 @@ static inline void nft_trace_packet(const struct nft_pktinfo *pkt,
} }
unsigned int unsigned int
nft_do_chain_pktinfo(struct nft_pktinfo *pkt, const struct nf_hook_ops *ops) nft_do_chain(struct nft_pktinfo *pkt, const struct nf_hook_ops *ops)
{ {
const struct nft_chain *chain = ops->priv; const struct nft_chain *chain = ops->priv;
const struct nft_rule *rule; const struct nft_rule *rule;
...@@ -216,7 +216,7 @@ nft_do_chain_pktinfo(struct nft_pktinfo *pkt, const struct nf_hook_ops *ops) ...@@ -216,7 +216,7 @@ nft_do_chain_pktinfo(struct nft_pktinfo *pkt, const struct nf_hook_ops *ops)
return nft_base_chain(chain)->policy; return nft_base_chain(chain)->policy;
} }
EXPORT_SYMBOL_GPL(nft_do_chain_pktinfo); EXPORT_SYMBOL_GPL(nft_do_chain);
int __init nf_tables_core_module_init(void) int __init nf_tables_core_module_init(void)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment