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

[kaber at netfilter.org]

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

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

This patch allows the u32 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/u32/linux-2.6/net/ipv4/netfilter/Makefile.ladd
===================================================================
--- trunk/patch-o-matic-ng/patchlets/u32/linux-2.6/net/ipv4/netfilter/Makefile.ladd	2006-03-29 09:06:51 UTC (rev 6570)
+++ trunk/patch-o-matic-ng/patchlets/u32/linux-2.6/net/ipv4/netfilter/Makefile.ladd	2006-03-29 09:07:11 UTC (rev 6571)
@@ -1,4 +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_U32) += ipt_u32.o
-

Modified: trunk/patch-o-matic-ng/patchlets/u32/linux-2.6/net/ipv4/netfilter/ipt_u32.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/u32/linux-2.6/net/ipv4/netfilter/ipt_u32.c	2006-03-29 09:06:51 UTC (rev 6570)
+++ trunk/patch-o-matic-ng/patchlets/u32/linux-2.6/net/ipv4/netfilter/ipt_u32.c	2006-03-29 09:07:11 UTC (rev 6571)
@@ -122,6 +122,7 @@
       const struct net_device *out,
       const void *matchinfo,
       int offset,
+      unsigned int protoff,
       int *hotdrop)
 {
 	const struct ipt_u32 *data = matchinfo;
@@ -201,7 +202,7 @@
 
 static int
 checkentry(const char *tablename,
-           const struct ipt_ip *ip,
+           const void *ip,
            void *matchinfo,
            unsigned int matchsize,
            unsigned int hook_mask)