lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netfilter: iptables: remove unused function arguments

Browse Source 
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
This commit is contained in:
Jan Engelhardt
2009-11-01 00:36:40 +01:00
parent 98e6d2d5ee
commit fa96a0e2e6
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/ipv4/netfilter/iptable_mangle.c
View File

@@ -36,11 +36,7 @@ static const struct xt_table packet_mangler = {
}; };
static unsigned int static unsigned int
ipt_local_hook(unsigned int hook, ipt_mangle_out(struct sk_buff *skb, const struct net_device *out)
struct sk_buff *skb,
const struct net_device *in,
const struct net_device *out,
int (*okfn)(struct sk_buff *))
{ {
unsigned int ret; unsigned int ret;
const struct iphdr *iph; const struct iphdr *iph;
@@ -60,7 +56,7 @@ ipt_local_hook(unsigned int hook,
daddr = iph->daddr; daddr = iph->daddr;
tos = iph->tos; tos = iph->tos;
ret = ipt_do_table(skb, hook, in, out, ret = ipt_do_table(skb, NF_INET_LOCAL_OUT, NULL, out,
dev_net(out)->ipv4.iptable_mangle); dev_net(out)->ipv4.iptable_mangle);
/* Reroute for ANY change. */ /* Reroute for ANY change. */
if (ret != NF_DROP && ret != NF_STOLEN && ret != NF_QUEUE) { if (ret != NF_DROP && ret != NF_STOLEN && ret != NF_QUEUE) {
@@ -86,7 +82,7 @@ iptable_mangle_hook(unsigned int hook,
int (*okfn)(struct sk_buff *)) int (*okfn)(struct sk_buff *))
{ {
if (hook == NF_INET_LOCAL_OUT) if (hook == NF_INET_LOCAL_OUT)
return ipt_local_hook(hook, skb, in, out, okfn); return ipt_mangle_out(skb, out);
if (hook == NF_INET_POST_ROUTING) if (hook == NF_INET_POST_ROUTING)
return ipt_do_table(skb, hook, in, out, return ipt_do_table(skb, hook, in, out,
dev_net(out)->ipv4.iptable_mangle); dev_net(out)->ipv4.iptable_mangle);

10
net/ipv6/netfilter/ip6table_mangle.c
View File

@@ -30,12 +30,8 @@ static const struct xt_table packet_mangler = {
}; };
static unsigned int static unsigned int
ip6t_local_out_hook(unsigned int hook, ip6t_mangle_out(struct sk_buff *skb, const struct net_device *out)
struct sk_buff *skb,
const struct net_device *out,
int (*okfn)(struct sk_buff *))
{ {
unsigned int ret; unsigned int ret;
struct in6_addr saddr, daddr; struct in6_addr saddr, daddr;
u_int8_t hop_limit; u_int8_t hop_limit;
@@ -60,7 +56,7 @@ ip6t_local_out_hook(unsigned int hook,
/* flowlabel and prio (includes version, which shouldn't change either */ /* flowlabel and prio (includes version, which shouldn't change either */
flowlabel = *((u_int32_t *)ipv6_hdr(skb)); flowlabel = *((u_int32_t *)ipv6_hdr(skb));
ret = ip6t_do_table(skb, hook, NULL, out, ret = ip6t_do_table(skb, NF_INET_LOCAL_OUT, NULL, out,
dev_net(out)->ipv6.ip6table_mangle); dev_net(out)->ipv6.ip6table_mangle);
if (ret != NF_DROP && ret != NF_STOLEN && if (ret != NF_DROP && ret != NF_STOLEN &&
@@ -80,7 +76,7 @@ ip6table_mangle_hook(unsigned int hook, struct sk_buff *skb,
int (*okfn)(struct sk_buff *)) int (*okfn)(struct sk_buff *))
{ {
if (hook == NF_INET_LOCAL_OUT) if (hook == NF_INET_LOCAL_OUT)
return ip6t_local_out_hook(hook, skb, out, okfn); return ip6t_mangle_out(skb, out);
if (hook == NF_INET_POST_ROUTING) if (hook == NF_INET_POST_ROUTING)
return ip6t_do_table(skb, hook, in, out, return ip6t_do_table(skb, hook, in, out,
dev_net(out)->ipv6.ip6table_mangle); dev_net(out)->ipv6.ip6table_mangle);