Skip to content

Commit

Permalink
[NETFILTER] ip[6]t_policy: Fix compilation warnings
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Benoit Boissinot authored and David S. Miller committed Jan 17, 2006
1 parent e35bedf commit ccc9132
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions net/ipv4/netfilter/ipt_policy.c
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,10 @@ match_policy_out(const struct sk_buff *skb, const struct ipt_policy_info *info)
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;
Expand All @@ -113,7 +116,7 @@ static int match(const struct sk_buff *skb,
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)
{
Expand Down
2 changes: 1 addition & 1 deletion net/ipv6/netfilter/ip6t_policy.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ static int match(const struct sk_buff *skb,
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)
{
Expand Down

0 comments on commit ccc9132

Please sign in to comment.