From: Gabor Juhos <juhosg@openwrt.org>
Date: Wed, 30 Jan 2008 07:03:02 +0000 (+0000)
Subject: netfilter: fix ipt_SET on 2.6.24
X-Git-Tag: reboot~27139
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fecd04ea67c7bdff121e9c78769abe6d58d956e5;p=oweals%2Fopenwrt.git

netfilter: fix ipt_SET on 2.6.24

SVN-Revision: 10317
---

diff --git a/target/linux/generic-2.6/patches-2.6.24/130-netfilter_ipset.patch b/target/linux/generic-2.6/patches-2.6.24/130-netfilter_ipset.patch
index 24d25d70c7..1828d897e9 100644
--- a/target/linux/generic-2.6/patches-2.6.24/130-netfilter_ipset.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/130-netfilter_ipset.patch
@@ -7358,7 +7358,7 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ipt_set.c linux-2.6.23.pom2patch.set/n
 diff -Nru linux-2.6.23/net/ipv4/netfilter/ipt_SET.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ipt_SET.c
 --- linux-2.6.23/net/ipv4/netfilter/ipt_SET.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ipt_SET.c	2007-10-12 11:52:37.000000000 +0200
-@@ -0,0 +1,172 @@
+@@ -0,0 +1,179 @@
 +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 + *                         Patrick Schaaf <bof@bof.de>
 + *                         Martin Josefsson <gandalf@wlug.westbo.se>
@@ -7387,7 +7387,11 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ipt_SET.c linux-2.6.23.pom2patch.set/n
 +#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,
@@ -7402,14 +7406,17 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ipt_SET.c linux-2.6.23.pom2patch.set/n
 +#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;