aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.37
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
commit2f3322b82e94b3bd461bff3f771b6a51e5d8ef0e (patch)
treedb30e1ad55fc4c974106a9947c21462cdce99e6a /target/linux/generic/patches-2.6.37
parent2b5c0fa98888a4fcd4cca8f2430a2449e7464061 (diff)
downloadupstream-2f3322b82e94b3bd461bff3f771b6a51e5d8ef0e.tar.gz
upstream-2f3322b82e94b3bd461bff3f771b6a51e5d8ef0e.tar.bz2
upstream-2f3322b82e94b3bd461bff3f771b6a51e5d8ef0e.zip
[generic] fix layer7 patches for Kernels >= 2.6.35, thanks Daniel Gimpelevich
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24728 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.37')
-rw-r--r--target/linux/generic/patches-2.6.37/102-netfilter_layer7_match.patch38
1 files changed, 32 insertions, 6 deletions
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
+ }
+
+