- real update for .35

Changed files:
    kernel-layer7.patch -> 1.4

diff --git a/kernel-layer7.patch b/kernel-layer7.patch
index 68a1c7e1ee665568180db564da89dcc3e1a3558e..978d4e2fbef98af5fa9cbb563c6cdc32ec59a7ab 100644 (file)
--- a/kernel-layer7.patch
+++ b/kernel-layer7.patch
@@ -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)
-+{
-+        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)
++static int check(const struct xt_mtchk_param *par)
 +{
-+        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)