[netfilter-cvslog] r4270 - in trunk/patch-o-matic-ng/patchlets/random/linux-2.6/net: ipv4/netfilter ipv6/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-09-19 17:09:56 +0200 (Mon, 19 Sep 2005)
New Revision: 4270

Modified:
   trunk/patch-o-matic-ng/patchlets/random/linux-2.6/net/ipv4/netfilter/ipt_random.c
   trunk/patch-o-matic-ng/patchlets/random/linux-2.6/net/ipv6/netfilter/ip6t_random.c
Log:
fix compiler warnings (Pawel Sikora)


Modified: trunk/patch-o-matic-ng/patchlets/random/linux-2.6/net/ipv4/netfilter/ipt_random.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/random/linux-2.6/net/ipv4/netfilter/ipt_random.c	2005-09-19 15:06:19 UTC (rev 4269)
+++ trunk/patch-o-matic-ng/patchlets/random/linux-2.6/net/ipv4/netfilter/ipt_random.c	2005-09-19 15:09:56 UTC (rev 4270)
@@ -51,7 +51,7 @@
 	const struct ipt_rand_info *info = matchinfo;
 
 	if (matchsize != IPT_ALIGN(sizeof(struct ipt_rand_info))) {
-		printk("ipt_random: matchsize %u != %u\n", matchsize,
+		printk("ipt_random: matchsize %u != %Zd\n", matchsize,
 		       IPT_ALIGN(sizeof(struct ipt_rand_info)));
 		return 0;
 	}

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	2005-09-19 15:06:19 UTC (rev 4269)
+++ trunk/patch-o-matic-ng/patchlets/random/linux-2.6/net/ipv6/netfilter/ip6t_random.c	2005-09-19 15:09:56 UTC (rev 4270)
@@ -25,8 +25,7 @@
 	       const struct net_device *out,
 	       const void *matchinfo,
 	       int offset,
-	       const void *hdr,
-	       u_int16_t datalen,
+	       unsigned int protoff,
 	       int *hotdrop)
 {
 	/* Parameters from userspace */
@@ -54,7 +53,7 @@
 	const struct ip6t_rand_info *info = matchinfo;
 
 	if (matchsize != IP6T_ALIGN(sizeof(struct ip6t_rand_info))) {
-		printk("ip6t_random: matchsize %u != %u\n", matchsize,
+		printk("ip6t_random: matchsize %u != %Zd\n", matchsize,
 		       IP6T_ALIGN(sizeof(struct ip6t_rand_info)));
 		return 0;
 	}