From: Gabor Juhos <juhosg@openwrt.org>
Date: Wed, 9 Jun 2010 17:56:42 +0000 (+0000)
Subject: generic: update xt_layer7 module fix for 2.6.35
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8c6a9eccb772112dee7bd3e4612dfe7afa24aded;p=openwrt%2Fstaging%2Fthess.git

generic: update xt_layer7 module fix for 2.6.35

SVN-Revision: 21741
---

diff --git a/target/linux/generic-2.6/patches-2.6.35/102-netfilter_layer7_match.patch b/target/linux/generic-2.6/patches-2.6.35/102-netfilter_layer7_match.patch
index a6b71ceecf..15fc5fadd2 100644
--- a/target/linux/generic-2.6/patches-2.6.35/102-netfilter_layer7_match.patch
+++ b/target/linux/generic-2.6/patches-2.6.35/102-netfilter_layer7_match.patch
@@ -1,11 +1,25 @@
 --- a/net/netfilter/xt_layer7.c
 +++ b/net/netfilter/xt_layer7.c
-@@ -416,7 +416,7 @@ static int layer7_write_proc(struct file
+@@ -415,7 +415,9 @@ static int layer7_write_proc(struct file
+ }
  
  static bool
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
--match(const struct sk_buff *skbin, const struct xt_match_param *par)
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
 +match(const struct sk_buff *skbin, struct xt_action_param *par)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+ match(const struct sk_buff *skbin, const struct xt_match_param *par)
  #else
  match(const struct sk_buff *skbin,
-       const struct net_device *in,
+@@ -598,7 +600,11 @@ match(const struct sk_buff *skbin,
+ 
+ // load nf_conntrack_ipv4
+ #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
+ {
+         if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
+                 printk(KERN_WARNING "can't load conntrack support for "