summaryrefslogtreecommitdiff
path: root/package/ipset/patches/patch-kernel_ipt_SET_c
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-09-05 21:11:28 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-09-05 21:11:28 +0200
commit606b7468614357005c320f396cc2e90256e3f277 (patch)
tree98934e121c07d340d0b45ae95d59329cc7fbe583 /package/ipset/patches/patch-kernel_ipt_SET_c
parent9d7af809f7881ed2dba51bf9e59ace51c6848ed6 (diff)
update to latest upstream
Diffstat (limited to 'package/ipset/patches/patch-kernel_ipt_SET_c')
-rw-r--r--package/ipset/patches/patch-kernel_ipt_SET_c30
1 files changed, 30 insertions, 0 deletions
diff --git a/package/ipset/patches/patch-kernel_ipt_SET_c b/package/ipset/patches/patch-kernel_ipt_SET_c
new file mode 100644
index 000000000..22c1aff14
--- /dev/null
+++ b/package/ipset/patches/patch-kernel_ipt_SET_c
@@ -0,0 +1,30 @@
+--- ipset-4.1.orig/kernel/ipt_SET.c 2009-11-10 21:45:41.000000000 +0100
++++ ipset-4.1/kernel/ipt_SET.c 2010-08-29 14:45:51.863658421 +0200
+@@ -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)