aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-12-19 16:46:47 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-12-19 16:46:47 +0000
commit4869f2c5e87e187af41509a2b43c768121149829 (patch)
tree31c474fb5ffab7897977adfe7f794a5780c12fca /target/linux
parent7526fd86276fe0bccefede69eed97583d3d06b70 (diff)
downloadupstream-4869f2c5e87e187af41509a2b43c768121149829.tar.gz
upstream-4869f2c5e87e187af41509a2b43c768121149829.tar.bz2
upstream-4869f2c5e87e187af41509a2b43c768121149829.zip
fix layer7 patches for Kernels >= 2.6.35, thanks Daniel Gimpelevich
SVN-Revision: 24728
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/patches-2.6.35/102-netfilter_layer7_match.patch38
-rw-r--r--target/linux/generic/patches-2.6.36/102-netfilter_layer7_match.patch38
-rw-r--r--target/linux/generic/patches-2.6.37/102-netfilter_layer7_match.patch38
3 files changed, 96 insertions, 18 deletions
diff --git a/target/linux/generic/patches-2.6.35/102-netfilter_layer7_match.patch b/target/linux/generic/patches-2.6.35/102-netfilter_layer7_match.patch
index 15fc5fadd2..b2e48c824f 100644
--- a/target/linux/generic/patches-2.6.35/102-netfilter_layer7_match.patch
+++ b/target/linux/generic/patches-2.6.35/102-netfilter_layer7_match.patch
@@ -11,15 +11,41 @@
match(const struct sk_buff *skbin, const struct xt_match_param *par)
#else
match(const struct sk_buff *skbin,
-@@ -598,7 +600,11 @@ match(const struct sk_buff *skbin,
+@@ -597,14 +599,19 @@ match(const struct sk_buff *skbin,
+ }
// load nf_conntrack_ipv4
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++static int
++#else
++static bool
++#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
-+static int check(const struct xt_mtchk_param *par)
-+# else
- static bool check(const struct xt_mtchk_param *par)
-+# endif
+-static bool check(const struct xt_mtchk_param *par)
++check(const struct xt_mtchk_param *par)
{
if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
printk(KERN_WARNING "can't load conntrack support for "
+ "proto=%d\n", par->match->family);
+ #else
+-static bool check(const char *tablename, const void *inf,
++check(const char *tablename, const void *inf,
+ const struct xt_match *match, void *matchinfo,
+ unsigned int hook_mask)
+ {
+@@ -612,9 +619,15 @@ static bool check(const char *tablename,
+ printk(KERN_WARNING "can't load conntrack support for "
+ "proto=%d\n", match->family);
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++ return -EINVAL;
++ }
++ return 0;
++#else
+ return 0;
+ }
+ return 1;
++#endif
+ }
+
+
diff --git a/target/linux/generic/patches-2.6.36/102-netfilter_layer7_match.patch b/target/linux/generic/patches-2.6.36/102-netfilter_layer7_match.patch
index 15fc5fadd2..b2e48c824f 100644
--- a/target/linux/generic/patches-2.6.36/102-netfilter_layer7_match.patch
+++ b/target/linux/generic/patches-2.6.36/102-netfilter_layer7_match.patch
@@ -11,15 +11,41 @@
match(const struct sk_buff *skbin, const struct xt_match_param *par)
#else
match(const struct sk_buff *skbin,
-@@ -598,7 +600,11 @@ match(const struct sk_buff *skbin,
+@@ -597,14 +599,19 @@ match(const struct sk_buff *skbin,
+ }
// load nf_conntrack_ipv4
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++static int
++#else
++static bool
++#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
-+static int check(const struct xt_mtchk_param *par)
-+# else
- static bool check(const struct xt_mtchk_param *par)
-+# endif
+-static bool check(const struct xt_mtchk_param *par)
++check(const struct xt_mtchk_param *par)
{
if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
printk(KERN_WARNING "can't load conntrack support for "
+ "proto=%d\n", par->match->family);
+ #else
+-static bool check(const char *tablename, const void *inf,
++check(const char *tablename, const void *inf,
+ const struct xt_match *match, void *matchinfo,
+ unsigned int hook_mask)
+ {
+@@ -612,9 +619,15 @@ static bool check(const char *tablename,
+ printk(KERN_WARNING "can't load conntrack support for "
+ "proto=%d\n", match->family);
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++ return -EINVAL;
++ }
++ return 0;
++#else
+ return 0;
+ }
+ return 1;
++#endif
+ }
+
+
diff --git a/target/linux/generic/patches-2.6.37/102-netfilter_layer7_match.patch b/target/linux/generic/patches-2.6.37/102-netfilter_layer7_match.patch
index 15fc5fadd2..b2e48c824f 100644
--- a/target/linux/generic/patches-2.6.37/102-netfilter_layer7_match.patch
+++ b/target/linux/generic/patches-2.6.37/102-netfilter_layer7_match.patch
@@ -11,15 +11,41 @@
match(const struct sk_buff *skbin, const struct xt_match_param *par)
#else
match(const struct sk_buff *skbin,
-@@ -598,7 +600,11 @@ match(const struct sk_buff *skbin,
+@@ -597,14 +599,19 @@ match(const struct sk_buff *skbin,
+ }
// load nf_conntrack_ipv4
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++static int
++#else
++static bool
++#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
-+static int check(const struct xt_mtchk_param *par)
-+# else
- static bool check(const struct xt_mtchk_param *par)
-+# endif
+-static bool check(const struct xt_mtchk_param *par)
++check(const struct xt_mtchk_param *par)
{
if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
printk(KERN_WARNING "can't load conntrack support for "
+ "proto=%d\n", par->match->family);
+ #else
+-static bool check(const char *tablename, const void *inf,
++check(const char *tablename, const void *inf,
+ const struct xt_match *match, void *matchinfo,
+ unsigned int hook_mask)
+ {
+@@ -612,9 +619,15 @@ static bool check(const char *tablename,
+ printk(KERN_WARNING "can't load conntrack support for "
+ "proto=%d\n", match->family);
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++ return -EINVAL;
++ }
++ return 0;
++#else
+ return 0;
+ }
+ return 1;
++#endif
+ }
+
+