diff options
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> | 2006-01-17 05:26:34 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-01-17 05:26:34 -0500 |
commit | ccc91324a1b44d345ab4f814eb2ff453c7e98f9e (patch) | |
tree | 24ac07d2a014a5f6b8dcc685fb76afea1048485d | |
parent | e35bedf369b17120dbd7d554bee45407a3825267 (diff) |
[NETFILTER] ip[6]t_policy: Fix compilation warnings
ip[6]t_policy argument conversion slipped when merging with x_tables
Signed-off-by: Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv4/netfilter/ipt_policy.c | 7 | ||||
-rw-r--r-- | net/ipv6/netfilter/ip6t_policy.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/net/ipv4/netfilter/ipt_policy.c b/net/ipv4/netfilter/ipt_policy.c index 709debcc69c9..18ca8258a1c5 100644 --- a/net/ipv4/netfilter/ipt_policy.c +++ b/net/ipv4/netfilter/ipt_policy.c | |||
@@ -95,7 +95,10 @@ match_policy_out(const struct sk_buff *skb, const struct ipt_policy_info *info) | |||
95 | static int match(const struct sk_buff *skb, | 95 | static int match(const struct sk_buff *skb, |
96 | const struct net_device *in, | 96 | const struct net_device *in, |
97 | const struct net_device *out, | 97 | const struct net_device *out, |
98 | const void *matchinfo, int offset, int *hotdrop) | 98 | const void *matchinfo, |
99 | int offset, | ||
100 | unsigned int protoff, | ||
101 | int *hotdrop) | ||
99 | { | 102 | { |
100 | const struct ipt_policy_info *info = matchinfo; | 103 | const struct ipt_policy_info *info = matchinfo; |
101 | int ret; | 104 | int ret; |
@@ -113,7 +116,7 @@ static int match(const struct sk_buff *skb, | |||
113 | return ret; | 116 | return ret; |
114 | } | 117 | } |
115 | 118 | ||
116 | static int checkentry(const char *tablename, const struct ipt_ip *ip, | 119 | static int checkentry(const char *tablename, const void *ip_void, |
117 | void *matchinfo, unsigned int matchsize, | 120 | void *matchinfo, unsigned int matchsize, |
118 | unsigned int hook_mask) | 121 | unsigned int hook_mask) |
119 | { | 122 | { |
diff --git a/net/ipv6/netfilter/ip6t_policy.c b/net/ipv6/netfilter/ip6t_policy.c index 13fedad48c1d..afe1cc4c18a5 100644 --- a/net/ipv6/netfilter/ip6t_policy.c +++ b/net/ipv6/netfilter/ip6t_policy.c | |||
@@ -118,7 +118,7 @@ static int match(const struct sk_buff *skb, | |||
118 | return ret; | 118 | return ret; |
119 | } | 119 | } |
120 | 120 | ||
121 | static int checkentry(const char *tablename, const struct ip6t_ip6 *ip, | 121 | static int checkentry(const char *tablename, const void *ip_void, |
122 | void *matchinfo, unsigned int matchsize, | 122 | void *matchinfo, unsigned int matchsize, |
123 | unsigned int hook_mask) | 123 | unsigned int hook_mask) |
124 | { | 124 | { |