diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-08-06 00:56:18 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-08-06 00:56:18 +0000 |
| commit | 2caa5916aa35c01747034773470c595c91312970 (patch) | |
| tree | ece64a57d8a50369a64c2cf8afd14ef073578a05 | |
| parent | f45be33f1789c7e644046c3ba3bf4c995ae7f401 (diff) | |
| download | upstream-2caa5916aa35c01747034773470c595c91312970.tar.gz upstream-2caa5916aa35c01747034773470c595c91312970.tar.bz2 upstream-2caa5916aa35c01747034773470c595c91312970.zip | |
ipset: fix ipset for kernel 2.6.35
SVN-Revision: 22500
| -rw-r--r-- | package/ipset/patches/001-2.6.35.patch | 62 |
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) |