packages: kernel/kernel-layer7.patch - real update for .35

[zbyniu]

Author: zbyniu                       Date: Sat Oct 16 18:18:12 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- real update for .35

---- Files affected:
packages/kernel:
   kernel-layer7.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-layer7.patch
diff -u packages/kernel/kernel-layer7.patch:1.3 packages/kernel/kernel-layer7.patch:1.4
--- packages/kernel/kernel-layer7.patch:1.3	Wed Aug 25 19:29:58 2010
+++ packages/kernel/kernel-layer7.patch	Sat Oct 16 20:18:07 2010
@@ -40,7 +40,7 @@
  obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
 --- linux-2.6.28-stock/net/netfilter/xt_layer7.c	1969-12-31 18:00:00.000000000 -0600
 +++ linux-2.6.28/net/netfilter/xt_layer7.c	2009-01-07 20:47:14.000000000 -0600
-@@ -0,0 +1,666 @@
+@@ -0,0 +1,656 @@
 +/*
 +  Kernel module to match application layer (OSI layer 7) data in connections.
 +
@@ -619,31 +619,21 @@
 +}
 +
 +// load nf_conntrack_ipv4
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+static bool check(const struct xt_mtchk_param *par)
++static int 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,
-+		 const struct xt_match *match, void *matchinfo,
-+		 unsigned int hook_mask)
-+{
-+        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", match->family);
-+#endif
-+                return 0;
++        if (nf_ct_l3proto_try_module_get(par->family) < 0) {
++                pr_info("can't load conntrack support for "
++                                    "proto=%d\n", par->family);
++                return -EINVAL;
 +        }
-+	return 1;
++	return 0;
 +}
 +
 +
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
 +	static void destroy(const struct xt_mtdtor_param *par)
 +	{
-+		nf_ct_l3proto_module_put(par->match->family);
++		nf_ct_l3proto_module_put(par->family);
 +	}
 +#else
 +	static void destroy(const struct xt_match *match, void *matchinfo)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-layer7.patch?r1=1.3&r2=1.4&f=u