aboutsummaryrefslogtreecommitdiffstats
path: root/package/ipset
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-08-06 00:56:18 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-08-06 00:56:18 +0000
commit39aab4ef92ba3192bc0d1262201ad49e0496f288 (patch)
tree6aeeffc8c398eddfd133462fa083f2d6309a1c41 /package/ipset
parent02d0ada4d2ae55b8220db12cfdc5a00d723c445f (diff)
downloadupstream-39aab4ef92ba3192bc0d1262201ad49e0496f288.tar.gz
upstream-39aab4ef92ba3192bc0d1262201ad49e0496f288.tar.bz2
upstream-39aab4ef92ba3192bc0d1262201ad49e0496f288.zip
[package] ipset: fix ipset for kernel 2.6.35
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22500 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/ipset')
-rw-r--r--package/ipset/patches/001-2.6.35.patch62
1 files changed, 62 insertions, 0 deletions
diff --git a/package/ipset/patches/001-2.6.35.patch b/package/ipset/patches/001-2.6.35.patch
new file mode 100644
index 0000000000..7e98e06fa2
--- /dev/null
+++ b/package/ipset/patches/001-2.6.35.patch
@@ -0,0 +1,62 @@
+--- a/kernel/ipt_set.c
++++ b/kernel/ipt_set.c
+@@ -83,10 +83,14 @@ match(const struct sk_buff *skb,
+ int offset,
+ unsigned int protoff,
+ bool *hotdrop)
+-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) */
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
+ static bool
+ match(const struct sk_buff *skb,
+ const struct xt_match_param *par)
++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) */
++static bool
++match(const struct sk_buff *skb,
++ struct xt_action_param *par)
+ #endif
+ {
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
+@@ -136,9 +140,12 @@ checkentry(const char *tablename,
+ const struct xt_match *match,
+ void *matchinfo,
+ unsigned int hook_mask)
+-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) */
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
+ static bool
+ checkentry(const struct xt_mtchk_param *par)
++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) */
++static int
++checkentry(const struct xt_mtchk_param *par)
+ #endif
+ {
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
+--- a/kernel/ipt_SET.c
++++ b/kernel/ipt_SET.c
+@@ -64,9 +64,12 @@ target(struct sk_buff *skb,
+ unsigned int hooknum,
+ const struct xt_target *target,
+ const void *targinfo)
+-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) */
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
+ target(struct sk_buff *skb,
+ const struct xt_target_param *par)
++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) */
++target(struct sk_buff *skb,
++ const struct xt_action_param *par)
+ #endif
+ {
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
+@@ -127,9 +130,12 @@ checkentry(const char *tablename,
+ const struct xt_target *target,
+ void *targinfo,
+ unsigned int hook_mask)
+-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) */
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
+ static bool
+ checkentry(const struct xt_tgchk_param *par)
++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) */
++static int
++checkentry(const struct xt_tgchk_param *par)
+ #endif
+ {
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)