a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Patrick McHardy 2014-01-09 18:42:43 +00:00 committed by Pablo Neira Ayuso
parent 44a6f0df03
commit 3876d22dba
10 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/netfilter/nf_tables.h
View File

@ -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);
/** /**

2
net/bridge/netfilter/nf_tables_bridge.c
View File

@ -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 = {

2
net/ipv4/netfilter/nf_tables_arp.c
View File

@ -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 = {

2
net/ipv4/netfilter/nf_tables_ipv4.c
View File

@ -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,

2
net/ipv4/netfilter/nft_chain_nat_ipv4.c
View File

@ -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)) {

2
net/ipv4/netfilter/nft_chain_route_ipv4.c
View File

@ -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);

2
net/ipv6/netfilter/nf_tables_ipv6.c
View File

@ -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,

2
net/ipv6/netfilter/nft_chain_nat_ipv6.c
View File

@ -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)) {

2
net/ipv6/netfilter/nft_chain_route_ipv6.c
View File

@ -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)) ||

4
net/netfilter/nf_tables_core.c
View File

@ -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 @@ next_rule:
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)
{ {