[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

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 15fc5fadd..b2e48c824 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 15fc5fadd..b2e48c824 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 15fc5fadd..b2e48c824 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
+ }
+ 
+