diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-11-04 08:22:13 -0500 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2008-11-04 08:22:13 -0500 |
commit | 19223f26d97077da8cf25251458afe00cae20cbb (patch) | |
tree | 453ad12de5398ba8ea8ed536af9ba974f0830ec1 /net/ipv4 | |
parent | d4ec52bae739409b2372fea30dba0e7a8d6b9181 (diff) |
netfilter: arptable_filter: merge forward hook
It's identical to NF_ARP_IN hook.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/netfilter/arptable_filter.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/net/ipv4/netfilter/arptable_filter.c b/net/ipv4/netfilter/arptable_filter.c index bee3d117661a..e091187e864f 100644 --- a/net/ipv4/netfilter/arptable_filter.c +++ b/net/ipv4/netfilter/arptable_filter.c | |||
@@ -75,16 +75,6 @@ static unsigned int arpt_out_hook(unsigned int hook, | |||
75 | dev_net(out)->ipv4.arptable_filter); | 75 | dev_net(out)->ipv4.arptable_filter); |
76 | } | 76 | } |
77 | 77 | ||
78 | static unsigned int arpt_forward_hook(unsigned int hook, | ||
79 | struct sk_buff *skb, | ||
80 | const struct net_device *in, | ||
81 | const struct net_device *out, | ||
82 | int (*okfn)(struct sk_buff *)) | ||
83 | { | ||
84 | return arpt_do_table(skb, hook, in, out, | ||
85 | dev_net(in)->ipv4.arptable_filter); | ||
86 | } | ||
87 | |||
88 | static struct nf_hook_ops arpt_ops[] __read_mostly = { | 78 | static struct nf_hook_ops arpt_ops[] __read_mostly = { |
89 | { | 79 | { |
90 | .hook = arpt_in_hook, | 80 | .hook = arpt_in_hook, |
@@ -101,7 +91,7 @@ static struct nf_hook_ops arpt_ops[] __read_mostly = { | |||
101 | .priority = NF_IP_PRI_FILTER, | 91 | .priority = NF_IP_PRI_FILTER, |
102 | }, | 92 | }, |
103 | { | 93 | { |
104 | .hook = arpt_forward_hook, | 94 | .hook = arpt_in_hook, |
105 | .owner = THIS_MODULE, | 95 | .owner = THIS_MODULE, |
106 | .pf = NFPROTO_ARP, | 96 | .pf = NFPROTO_ARP, |
107 | .hooknum = NF_ARP_FORWARD, | 97 | .hooknum = NF_ARP_FORWARD, |