SOURCES (LINUX_2_6): kernel-pom-ng-mms-conntrack-nat.patch - up for 2.6.26

[arekm]

Author: arekm                        Date: Mon Jul 14 18:01:52 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- up for 2.6.26

---- Files affected:
SOURCES:
   kernel-pom-ng-mms-conntrack-nat.patch (1.1.2.5 -> 1.1.2.6) 

---- Diffs:

================================================================
Index: SOURCES/kernel-pom-ng-mms-conntrack-nat.patch
diff -u SOURCES/kernel-pom-ng-mms-conntrack-nat.patch:1.1.2.5 SOURCES/kernel-pom-ng-mms-conntrack-nat.patch:1.1.2.6
--- SOURCES/kernel-pom-ng-mms-conntrack-nat.patch:1.1.2.5	Tue Jan 22 03:08:28 2008
+++ SOURCES/kernel-pom-ng-mms-conntrack-nat.patch	Mon Jul 14 20:01:46 2008
@@ -40,17 +40,17 @@
 --- linux-2.6.21.a/include/net/netfilter/nf_conntrack.h	2007-05-30 11:14:07.000000000 +0200
 +++ linux-2.6.21.b/include/net/netfilter/nf_conntrack.h	2007-05-30 11:50:55.000000000 +0200
 @@ -46,6 +46,7 @@ union nf_conntrack_expect_proto {
- #include <linux/netfilter/nf_conntrack_pptp.h>
  #include <linux/netfilter/nf_conntrack_h323.h>
  #include <linux/netfilter/nf_conntrack_sane.h>
+ #include <linux/netfilter/nf_conntrack_sip.h>
 +#include <linux/netfilter/nf_conntrack_mms.h>
  
  /* per conntrack: application helper private data */
  union nf_conntrack_help {
 @@ -54,6 +55,7 @@ union nf_conntrack_help {
- 	struct nf_ct_pptp_master ct_pptp_info;
  	struct nf_ct_h323_master ct_h323_info;
  	struct nf_ct_sane_master ct_sane_info;
+ 	struct nf_ct_sip_master ct_sip_info;
 +	struct nf_ct_mms_master ct_mms_info;
  };
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-pom-ng-mms-conntrack-nat.patch?r1=1.1.2.5&r2=1.1.2.6&f=u