Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 3876d22dba62ebf6582f33e1ef2160eeb95e1129

Authored by Patrick McHardy
Committed by Pablo Neira Ayuso
1 parent 44a6f0df03
Exists in master and in 16 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 10 changed files with 12 additions and 12 deletions Side-by-side Diff

include/net/netfilter/nf_tables.h
Diff comments   View file @ 3876d22
... ... @@ -447,8 +447,8 @@
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
net/bridge/netfilter/nf_tables_bridge.c
Diff comments   View file @ 3876d22
... ... @@ -25,7 +25,7 @@
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 = {
net/ipv4/netfilter/nf_tables_arp.c
Diff comments   View file @ 3876d22
... ... @@ -25,7 +25,7 @@
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 = {
net/ipv4/netfilter/nf_tables_ipv4.c
Diff comments   View file @ 3876d22
... ... @@ -28,7 +28,7 @@
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,
net/ipv4/netfilter/nft_chain_nat_ipv4.c
Diff comments   View file @ 3876d22
... ... @@ -75,7 +75,7 @@
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)) {
net/ipv4/netfilter/nft_chain_route_ipv4.c
Diff comments   View file @ 3876d22
... ... @@ -47,7 +47,7 @@
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  
net/ipv6/netfilter/nf_tables_ipv6.c
Diff comments   View file @ 3876d22
... ... @@ -28,7 +28,7 @@
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,
net/ipv6/netfilter/nft_chain_nat_ipv6.c
Diff comments   View file @ 3876d22
... ... @@ -79,7 +79,7 @@
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)) {
net/ipv6/netfilter/nft_chain_route_ipv6.c
Diff comments   View file @ 3876d22
... ... @@ -47,7 +47,7 @@
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)) ||
net/netfilter/nf_tables_core.c
Diff comments   View file @ 3876d22
... ... @@ -116,7 +116,7 @@
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,7 +216,7 @@
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 {