qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 01:43:08 +02:00
Code

[package] ipset: fix ipset for kernel 2.6.35

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22500 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2010-08-06 00:56:18 +00:00
parent 44615aa881
commit a4c4f9cb37
1 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
package/ipset/patches/001-2.6.35.patch Normal file
View File

@ -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)