Hi,
the following warnings appeared in -mm4
net/ipv4/netfilter/ipt_policy.c:154: warning: initialization from incompatible pointer type
net/ipv4/netfilter/ipt_policy.c:155: warning: initialization from incompatible pointer type
net/ipv6/netfilter/ip6t_policy.c:160: warning: initialization from incompatible pointer type
It looks like they were missed in the x_tables conversion.
Signed-off-by: Benoit Boissinot <[email protected]>
--- a/net/ipv4/netfilter/ipt_policy.c 2006-01-14 16:11:52.000000000 +0100
+++ b/net/ipv4/netfilter/ipt_policy.c 2006-01-14 18:55:26.000000000 +0100
@@ -95,7 +95,10 @@
static int match(const struct sk_buff *skb,
const struct net_device *in,
const struct net_device *out,
- const void *matchinfo, int offset, int *hotdrop)
+ const void *matchinfo,
+ int offset,
+ unsigned int protoff,
+ int *hotdrop)
{
const struct ipt_policy_info *info = matchinfo;
int ret;
@@ -113,7 +116,7 @@
return ret;
}
-static int checkentry(const char *tablename, const struct ipt_ip *ip,
+static int checkentry(const char *tablename, const void *ip_void,
void *matchinfo, unsigned int matchsize,
unsigned int hook_mask)
{
--- a/net/ipv6/netfilter/ip6t_policy.c 2006-01-14 16:11:52.000000000 +0100
+++ b/net/ipv6/netfilter/ip6t_policy.c 2006-01-14 18:52:58.000000000 +0100
@@ -118,7 +118,7 @@
return ret;
}
-static int checkentry(const char *tablename, const struct ip6t_ip6 *ip,
+static int checkentry(const char *tablename, const void *ip_void,
void *matchinfo, unsigned int matchsize,
unsigned int hook_mask)
{
On Sat, Jan 14, 2006 at 07:09:17PM +0100, Benoit Boissinot wrote:
> Hi,
>
> the following warnings appeared in -mm4
> net/ipv4/netfilter/ipt_policy.c:154: warning: initialization from incompatible pointer type
> net/ipv4/netfilter/ipt_policy.c:155: warning: initialization from incompatible pointer type
> net/ipv6/netfilter/ip6t_policy.c:160: warning: initialization from incompatible pointer type
oops, sorry. my mistake when merging patricks' ipt_policy code with
x_tables.
> It looks like they were missed in the x_tables conversion.
yes, since they were developed separately and only later merged.
> Signed-off-by: Benoit Boissinot <[email protected]>
I'll push this without any modifications via DaveM.
--
- Harald Welte <[email protected]> http://netfilter.org/
============================================================================
"Fragmentation is like classful addressing -- an interesting early
architectural error that shows how much experimentation was going
on while IP was being designed." -- Paul Vixie