mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
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 <[email protected]> Signed-off-by: Pablo Neira Ayuso <[email protected]>
This commit is contained in:
parent
44a6f0df03
commit
3876d22dba
10 changed files with 12 additions and 12 deletions
|
|
@ -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)
|
||||
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,
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
ret = nft_do_chain_pktinfo(&pkt, ops);
|
||||
ret = nft_do_chain(&pkt, ops);
|
||||
if (ret != NF_ACCEPT)
|
||||
return ret;
|
||||
if (!nf_nat_initialized(ct, maniptype)) {
|
||||
|
|
|
|||
|
|
@ -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 = *((u32 *)ipv6_hdr(skb));
|
||||
|
||||
ret = nft_do_chain_pktinfo(&pkt, ops);
|
||||
ret = nft_do_chain(&pkt, ops);
|
||||
if (ret != NF_DROP && ret != NF_QUEUE &&
|
||||
(memcmp(&ipv6_hdr(skb)->saddr, &saddr, sizeof(saddr)) ||
|
||||
memcmp(&ipv6_hdr(skb)->daddr, &daddr, sizeof(daddr)) ||
|
||||
|
|
|
|||
Loading…
Reference in a new issue