fix compile error in IPv6 versions of nth and random modules

fix compile error in IPv6 versions of nth and random modules

[Daniel De Graaf]

[-- Attachment #1: Type: text/plain, Size: 315 bytes --]

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.

- Daniel De Graaf

[-- Attachment #2: diff --]
[-- Type: application/octet-stream, Size: 1773 bytes --]

Index: patchlets/nth/linux-2.6.10/net/ipv6/netfilter/ip6t_nth.c
===================================================================
--- patchlets/nth/linux-2.6.10/net/ipv6/netfilter/ip6t_nth.c	(revision 6560)
+++ patchlets/nth/linux-2.6.10/net/ipv6/netfilter/ip6t_nth.c	(working copy)
@@ -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)
 {
Index: patchlets/random/linux-2.6/net/ipv6/netfilter/ip6t_random.c
===================================================================
--- patchlets/random/linux-2.6/net/ipv6/netfilter/ip6t_random.c	(revision 6560)
+++ patchlets/random/linux-2.6/net/ipv6/netfilter/ip6t_random.c	(working copy)
@@ -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)
 {

Re: fix compile error in IPv6 versions of nth and random modules

[Patrick McHardy]

Daniel De Graaf wrote:
> 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.

Applied, thanks. Unfortunately 2.6.17 will require another patch ..

BTW:

Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: base64
Content-Disposition: inline

...

Content-Type: application/octet-stream; name=diff
Content-Transfer-Encoding: 7bit
X-Attachment-Id: f_elchtr7v
Content-Disposition: attachment; filename="diff"

Please make sure the plain patch is sent inline so it can be viewed in
the mail client without saving first.