KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

generic: update xt_layer7 module fix for 2.6.35

Browse source 
SVN-Revision: 21741
This commit is contained in:
Gabor Juhos 2010-06-09 17:56:42 +00:00
parent c9f459572e
commit 8c6a9eccb7
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
target/linux/generic-2.6/patches-2.6.35/102-netfilter_layer7_match.patch
View file

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