From: Benoit Boissinot <benoit.boissinot@ens-lyon.org>
To: Andrew Morton <akpm@osdl.org>
Cc: Harald Welte <laforge@netfilter.org>, linux-kernel@vger.kernel.org
Subject: [patch 2.6.15-mm4] fix warning in ip{,6}t_policy.c
Date: Sat, 14 Jan 2006 19:09:17 +0100 [thread overview]
Message-ID: <20060114180917.GA26443@ens-lyon.fr> (raw)
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 <benoit.boissinot@ens-lyon.org>
--- 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)
{
next reply other threads:[~2006-01-14 18:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-14 18:09 Benoit Boissinot [this message]
2006-01-14 20:38 ` Harald Welte
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060114180917.GA26443@ens-lyon.fr \
--to=benoit.boissinot@ens-lyon.org \
--cc=akpm@osdl.org \
--cc=laforge@netfilter.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®