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_c32
1 files changed, 32 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..50f81919a
--- /dev/null
+++ b/package/ipset/patches/patch-kernel_ipt_set_c
@@ -0,0 +1,32 @@
+--- 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.832408251 +0200
+@@ -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)