From 01ae6f66e70cf7db2abfc61ca1f7459ac21e2009 Mon Sep 17 00:00:00 2001
From: Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Date: Tue, 17 Jan 2006 02:26:34 -0800
Subject: [PATCH] --- yaml --- r: 18749 b: refs/heads/master c:
 ccc91324a1b44d345ab4f814eb2ff453c7e98f9e h: refs/heads/master i:   18747:
 8d1c27681b3f08dacfa3f9c3e95317f6b6c388e7 v: v3

---
 [refs]                                 | 2 +-
 trunk/net/ipv4/netfilter/ipt_policy.c  | 7 +++++--
 trunk/net/ipv6/netfilter/ip6t_policy.c | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9909433a5172..e35dfd6977c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e35bedf369b17120dbd7d554bee45407a3825267
+refs/heads/master: ccc91324a1b44d345ab4f814eb2ff453c7e98f9e
diff --git a/trunk/net/ipv4/netfilter/ipt_policy.c b/trunk/net/ipv4/netfilter/ipt_policy.c
index 709debcc69c9..18ca8258a1c5 100644
--- a/trunk/net/ipv4/netfilter/ipt_policy.c
+++ b/trunk/net/ipv4/netfilter/ipt_policy.c
@@ -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)
 {
diff --git a/trunk/net/ipv6/netfilter/ip6t_policy.c b/trunk/net/ipv6/netfilter/ip6t_policy.c
index 13fedad48c1d..afe1cc4c18a5 100644
--- a/trunk/net/ipv6/netfilter/ip6t_policy.c
+++ b/trunk/net/ipv6/netfilter/ip6t_policy.c
@@ -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)
 {