diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-11-20 09:58:08 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2008-11-20 09:58:08 +0100 |
| commit | 61d3015808d877eb4ea225b5924feb128b0c1bc7 (patch) | |
| tree | 55e7ca8fd9ead7df7be4b8cdbd1530a95550a2ea | |
| parent | b0ceb560a4119f187dc50da655be389cb54ae4f9 (diff) | |
| download | linux-61d3015808d877eb4ea225b5924feb128b0c1bc7.tar.gz linux-61d3015808d877eb4ea225b5924feb128b0c1bc7.tar.bz2 linux-61d3015808d877eb4ea225b5924feb128b0c1bc7.zip | |
netfilter: ip6table_filter: merge LOCAL_IN and FORWARD hooks
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
| -rw-r--r-- | net/ipv6/netfilter/ip6table_filter.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/net/ipv6/netfilter/ip6table_filter.c b/net/ipv6/netfilter/ip6table_filter.c index b110a8a85a14..40d2e36d8fac 100644 --- a/net/ipv6/netfilter/ip6table_filter.c +++ b/net/ipv6/netfilter/ip6table_filter.c @@ -61,7 +61,7 @@ static struct xt_table packet_filter = { /* The work comes in here from netfilter.c. */ static unsigned int -ip6t_local_in_hook(unsigned int hook, +ip6t_in_hook(unsigned int hook, struct sk_buff *skb, const struct net_device *in, const struct net_device *out, @@ -72,17 +72,6 @@ ip6t_local_in_hook(unsigned int hook, } static unsigned int -ip6t_forward_hook(unsigned int hook, - struct sk_buff *skb, - const struct net_device *in, - const struct net_device *out, - int (*okfn)(struct sk_buff *)) -{ - return ip6t_do_table(skb, hook, in, out, - dev_net(in)->ipv6.ip6table_filter); -} - -static unsigned int ip6t_local_out_hook(unsigned int hook, struct sk_buff *skb, const struct net_device *in, @@ -105,14 +94,14 @@ ip6t_local_out_hook(unsigned int hook, static struct nf_hook_ops ip6t_ops[] __read_mostly = { { - .hook = ip6t_local_in_hook, + .hook = ip6t_in_hook, .owner = THIS_MODULE, .pf = PF_INET6, .hooknum = NF_INET_LOCAL_IN, .priority = NF_IP6_PRI_FILTER, }, { - .hook = ip6t_forward_hook, + .hook = ip6t_in_hook, .owner = THIS_MODULE, .pf = PF_INET6, .hooknum = NF_INET_FORWARD, |