Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccc91324 authored by Benoit Boissinot's avatar Benoit Boissinot Committed by David S. Miller
Browse files

[NETFILTER] ip[6]t_policy: Fix compilation warnings 



ip[6]t_policy argument conversion slipped when merging with x_tables

Signed-off-by: default avatarBenoit Boissinot <benoit.boissinot@ens-lyon.org>
Signed-off-by: default avatarHarald Welte <laforge@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e35bedf3

net/ipv4/netfilter/ipt_policy.c

+5 −2
Original line number Diff line number Diff line
@@ -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;
@@ -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)

{

net/ipv6/netfilter/ip6t_policy.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{