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

[kadlec at blackhole.kfki.hu]

Author: kadlec at blackhole.kfki.hu
Date: 2008-02-12 13:12:06 +0100 (Tue, 12 Feb 2008)
New Revision: 7363

Modified:
   trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ipt_SET.c
Log:
2.6.24 compatibility fix


Modified: trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ipt_SET.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ipt_SET.c	2008-02-12 11:08:15 UTC (rev 7362)
+++ trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ipt_SET.c	2008-02-12 12:12:06 UTC (rev 7363)
@@ -26,7 +26,11 @@
 #include <linux/netfilter_ipv4/ipt_set.h>
 
 static unsigned int
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
+target(struct sk_buff *skb,
+#else
 target(struct sk_buff **pskb,
+#endif
        const struct net_device *in,
        const struct net_device *out,
        unsigned int hooknum,
@@ -41,14 +45,18 @@
 #endif
 {
 	const struct ipt_set_info_target *info = targinfo;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+	struct sk_buff *skb = *pskb;
+#endif
+
 	
 	if (info->add_set.index != IP_SET_INVALID_ID)
 		ip_set_addip_kernel(info->add_set.index,
-				    *pskb,
+				    skb,
 				    info->add_set.flags);
 	if (info->del_set.index != IP_SET_INVALID_ID)
 		ip_set_delip_kernel(info->del_set.index,
-				    *pskb,
+				    skb,
 				    info->del_set.flags);
 
 	return IPT_CONTINUE;