aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2009-10-31 19:36:40 -0400
committerJan Engelhardt <jengelh@medozas.de>2010-02-15 10:56:51 -0500
commitfa96a0e2e67fe34a3d994e3f354a5c229dd14286 (patch)
tree723129525104cae2bc5db2ce812b26c9f9d9da94 /net/ipv6
parent98e6d2d5ee26bf56850a10eb64139c68fb09ba19 (diff)
netfilter: iptables: remove unused function arguments
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/netfilter/ip6table_mangle.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/net/ipv6/netfilter/ip6table_mangle.c b/net/ipv6/netfilter/ip6table_mangle.c
index b6216dede52..7844e557c0e 100644
--- a/net/ipv6/netfilter/ip6table_mangle.c
+++ b/net/ipv6/netfilter/ip6table_mangle.c
@@ -30,12 +30,8 @@ static const struct xt_table packet_mangler = {
30}; 30};
31 31
32static unsigned int 32static unsigned int
33ip6t_local_out_hook(unsigned int hook, 33ip6t_mangle_out(struct sk_buff *skb, const struct net_device *out)
34 struct sk_buff *skb,
35 const struct net_device *out,
36 int (*okfn)(struct sk_buff *))
37{ 34{
38
39 unsigned int ret; 35 unsigned int ret;
40 struct in6_addr saddr, daddr; 36 struct in6_addr saddr, daddr;
41 u_int8_t hop_limit; 37 u_int8_t hop_limit;
@@ -60,7 +56,7 @@ ip6t_local_out_hook(unsigned int hook,
60 /* flowlabel and prio (includes version, which shouldn't change either */ 56 /* flowlabel and prio (includes version, which shouldn't change either */
61 flowlabel = *((u_int32_t *)ipv6_hdr(skb)); 57 flowlabel = *((u_int32_t *)ipv6_hdr(skb));
62 58
63 ret = ip6t_do_table(skb, hook, NULL, out, 59 ret = ip6t_do_table(skb, NF_INET_LOCAL_OUT, NULL, out,
64 dev_net(out)->ipv6.ip6table_mangle); 60 dev_net(out)->ipv6.ip6table_mangle);
65 61
66 if (ret != NF_DROP && ret != NF_STOLEN && 62 if (ret != NF_DROP && ret != NF_STOLEN &&
@@ -80,7 +76,7 @@ ip6table_mangle_hook(unsigned int hook, struct sk_buff *skb,
80 int (*okfn)(struct sk_buff *)) 76 int (*okfn)(struct sk_buff *))
81{ 77{
82 if (hook == NF_INET_LOCAL_OUT) 78 if (hook == NF_INET_LOCAL_OUT)
83 return ip6t_local_out_hook(hook, skb, out, okfn); 79 return ip6t_mangle_out(skb, out);
84 if (hook == NF_INET_POST_ROUTING) 80 if (hook == NF_INET_POST_ROUTING)
85 return ip6t_do_table(skb, hook, in, out, 81 return ip6t_do_table(skb, hook, in, out,
86 dev_net(out)->ipv6.ip6table_mangle); 82 dev_net(out)->ipv6.ip6table_mangle);