[netfilter-cvslog] r6572 - trunk/patch-o-matic-ng/patchlets/unclean/linux-2.6/net/ipv4/netfilter

[kaber at netfilter.org]

Author: kaber at netfilter.org
Date: 2006-03-29 11:07:36 +0200 (Wed, 29 Mar 2006)
New Revision: 6572

Modified:
   trunk/patch-o-matic-ng/patchlets/unclean/linux-2.6/net/ipv4/netfilter/Makefile.ladd
   trunk/patch-o-matic-ng/patchlets/unclean/linux-2.6/net/ipv4/netfilter/ipt_unclean.c
Log:
[POM-NG 10/10] Fix the unclean extension for 2.6.16 kernels

This patch allows the unclean extension to be used with 2.6.16 kernels

Signed-off-by: Krzysztof Piotr Oledzki <ole at ans.pl>


Modified: trunk/patch-o-matic-ng/patchlets/unclean/linux-2.6/net/ipv4/netfilter/Makefile.ladd
===================================================================
--- trunk/patch-o-matic-ng/patchlets/unclean/linux-2.6/net/ipv4/netfilter/Makefile.ladd	2006-03-29 09:07:11 UTC (rev 6571)
+++ trunk/patch-o-matic-ng/patchlets/unclean/linux-2.6/net/ipv4/netfilter/Makefile.ladd	2006-03-29 09:07:36 UTC (rev 6572)
@@ -1,2 +1,2 @@
-obj-$(CONFIG_IP_NF_MATCH_LENGTH) += ipt_length.o
+obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
 obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o

Modified: trunk/patch-o-matic-ng/patchlets/unclean/linux-2.6/net/ipv4/netfilter/ipt_unclean.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/unclean/linux-2.6/net/ipv4/netfilter/ipt_unclean.c	2006-03-29 09:07:11 UTC (rev 6571)
+++ trunk/patch-o-matic-ng/patchlets/unclean/linux-2.6/net/ipv4/netfilter/ipt_unclean.c	2006-03-29 09:07:36 UTC (rev 6572)
@@ -570,6 +570,7 @@
       const struct net_device *out,
       const void *matchinfo,
       int offset,
+      unsigned int protoff,
       int *hotdrop)
 {
 	return !check_ip(skb, 0);
@@ -578,7 +579,7 @@
 /* Called when user tries to insert an entry of this type. */
 static int
 checkentry(const char *tablename,
-	   const struct ipt_ip *ip,
+	   const void *ip,
 	   void *matchinfo,
 	   unsigned int matchsize,
 	   unsigned int hook_mask)