[netfilter-cvslog] r6561 - in trunk/patch-o-matic-ng/patchlets: nth/linux-2.6.10/net/ipv6/netfilter random/linux-2.6/net/ipv6/netfilter

[kaber at netfilter.org]

Author: kaber at netfilter.org
Date: 2006-03-29 10:50:53 +0200 (Wed, 29 Mar 2006)
New Revision: 6561

Modified:
   trunk/patch-o-matic-ng/patchlets/nth/linux-2.6.10/net/ipv6/netfilter/ip6t_nth.c
   trunk/patch-o-matic-ng/patchlets/random/linux-2.6/net/ipv6/netfilter/ip6t_random.c
Log:
[PATCH]: fix compile error in IPv6 versions of nth and random modules (Daniel De Graaf)

When compiled for IPv6, the nth and random modules produce compile
errors because of a change in the ip6t_match structure. These patches
fix that error and a related warning about incompatible types. Since
the patches are nearly identical, I am posting them together; sorry if
this is a problem.


Modified: trunk/patch-o-matic-ng/patchlets/nth/linux-2.6.10/net/ipv6/netfilter/ip6t_nth.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/nth/linux-2.6.10/net/ipv6/netfilter/ip6t_nth.c	2006-03-28 12:14:46 UTC (rev 6560)
+++ trunk/patch-o-matic-ng/patchlets/nth/linux-2.6.10/net/ipv6/netfilter/ip6t_nth.c	2006-03-29 08:50:53 UTC (rev 6561)
@@ -114,7 +114,7 @@
 
 static int
 ip6t_nth_checkentry(const char *tablename,
-		   const struct ip6t_ip6 *e,
+		   const void *ip,
 		   void *matchinfo,
 		   unsigned int matchsize,
 		   unsigned int hook_mask)
@@ -139,13 +139,12 @@
 	return 1;
 }
 
-static struct ip6t_match ip6t_nth_reg = { 
-	{NULL, NULL},
-	"nth",
-	ip6t_nth_match,
-	ip6t_nth_checkentry,
-	NULL,
-	THIS_MODULE };
+static struct ip6t_match ip6t_nth_reg = {
+	.name       = "nth",
+	.match      = &ip6t_nth_match,
+	.checkentry = &ip6t_nth_checkentry,
+	.me	    = THIS_MODULE,
+};
 
 static int __init init(void)
 {

Modified: trunk/patch-o-matic-ng/patchlets/random/linux-2.6/net/ipv6/netfilter/ip6t_random.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/random/linux-2.6/net/ipv6/netfilter/ip6t_random.c	2006-03-28 12:14:46 UTC (rev 6560)
+++ trunk/patch-o-matic-ng/patchlets/random/linux-2.6/net/ipv6/netfilter/ip6t_random.c	2006-03-29 08:50:53 UTC (rev 6561)
@@ -44,7 +44,7 @@
 
 static int
 ip6t_rand_checkentry(const char *tablename,
-		   const struct ip6t_ip6 *e,
+		   const void *ip,
 		   void *matchinfo,
 		   unsigned int matchsize,
 		   unsigned int hook_mask)
@@ -69,13 +69,12 @@
 	return 1;
 }
 
-static struct ip6t_match ip6t_rand_reg = { 
-	{NULL, NULL},
-	"random",
-	ip6t_rand_match,
-	ip6t_rand_checkentry,
-	NULL,
-	THIS_MODULE };
+static struct ip6t_match ip6t_rand_reg = {
+	.name       = "random",
+	.match      = &ip6t_rand_match,
+	.checkentry = &ip6t_rand_checkentry,
+	.me         = THIS_MODULE,
+};
 
 static int __init init(void)
 {