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

[kaber at netfilter.org]

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

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

This patch allows the ipp2p 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/ipp2p/linux-2.6/net/ipv4/netfilter/Makefile.ladd
===================================================================
--- trunk/patch-o-matic-ng/patchlets/ipp2p/linux-2.6/net/ipv4/netfilter/Makefile.ladd	2006-03-29 08:59:21 UTC (rev 6563)
+++ trunk/patch-o-matic-ng/patchlets/ipp2p/linux-2.6/net/ipv4/netfilter/Makefile.ladd	2006-03-29 09:01:49 UTC (rev 6564)
@@ -1,2 +1,2 @@
-obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o
+obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
 obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o

Modified: trunk/patch-o-matic-ng/patchlets/ipp2p/linux-2.6/net/ipv4/netfilter/ipt_ipp2p.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/ipp2p/linux-2.6/net/ipv4/netfilter/ipt_ipp2p.c	2006-03-29 08:59:21 UTC (rev 6563)
+++ trunk/patch-o-matic-ng/patchlets/ipp2p/linux-2.6/net/ipv4/netfilter/ipt_ipp2p.c	2006-03-29 09:01:49 UTC (rev 6564)
@@ -520,6 +520,7 @@
       const struct net_device *out,
       const void *matchinfo,
       int offset,
+      unsigned int protoff,
       int *hotdrop)
 {
     const struct ipt_p2p_info *info = matchinfo;
@@ -598,7 +599,7 @@
 
 static int
 checkentry(const char *tablename,
-            const struct ipt_ip *ip,
+            const void *ip,
 	    void *matchinfo,
 	    unsigned int matchsize,
 	    unsigned int hook_mask)