X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel-layer7.patch;h=c06af650d6250d059ee10c47da6f5022850fa4eb;hb=d5c949f761eca49b04f234a3b3cd66075409a464;hp=612c295da23c69ec92f689b8eae1627e4afc7c0b;hpb=03673fb00c2ede2da044eef49a97f427bf603ff4;p=packages%2Fkernel.git

diff --git a/kernel-layer7.patch b/kernel-layer7.patch
index 612c295d..c06af650 100644
--- a/kernel-layer7.patch
+++ b/kernel-layer7.patch
@@ -2081,12 +2081,12 @@
  	if (seq_has_overflowed(s))
 --- linux-2.6.28-stock/include/net/netfilter/nf_conntrack.h	2009-01-07 16:05:30.000000000 -0600
 +++ linux-2.6.28/include/net/netfilter/nf_conntrack.h	2009-01-07 16:07:31.000000000 -0600
-@@ -118,6 +118,22 @@ struct nf_conn
- 	struct net *ct_net;
- #endif
+@@ -120,6 +120,22 @@ struct nf_conn {
+ 	/* Extensions */
+ 	struct nf_ct_ext *ext;
  
 +#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || \
-+    defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
++	defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
 +	struct {
 +		/*
 +		 * e.g. "http". NULL before decision. "unknown" after decision
@@ -2103,7 +2103,7 @@
 +
  	/* Storage reserved for other modules, must be the last member */
  	union nf_conntrack_proto proto;
- 
+ };
 --- linux-2.6.28-stock/include/linux/netfilter/xt_layer7.h	1969-12-31 18:00:00.000000000 -0600
 +++ linux-2.6.28/include/linux/netfilter/xt_layer7.h	2009-01-07 16:07:31.000000000 -0600
 @@ -0,0 +1,13 @@