SOURCES (LINUX_2_6): linux-2.6-pom-ng-branch.diff - fix ip_conntra...

[baggins]

Author: baggins                      Date: Fri Aug 26 15:56:54 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- fix ip_conntrack_amanda Oops

---- Files affected:
SOURCES:
   linux-2.6-pom-ng-branch.diff (1.1.2.17 -> 1.1.2.18) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-pom-ng-branch.diff
diff -u SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.17 SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.18
--- SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.17	Fri Aug 26 15:40:25 2005
+++ SOURCES/linux-2.6-pom-ng-branch.diff	Fri Aug 26 17:56:48 2005
@@ -7237,6 +7237,19 @@
 +
 +module_init(init);
 +module_exit(fini);
+Index: net/ipv4/netfilter/ip_conntrack_amanda.c
+===================================================================
+--- net/ipv4/netfilter/ip_conntrack_amanda.c	(.../branches/vanilla-2.6.12.x)	(revision 6284)
++++ net/ipv4/netfilter/ip_conntrack_amanda.c	(.../trunk)	(revision 6284)
+@@ -66,7 +66,7 @@
+ 
+ 	/* increase the UDP timeout of the master connection as replies from
+ 	 * Amanda clients to the server can be quite delayed */
+-	ip_ct_refresh_acct(ct, ctinfo, NULL, master_timeout * HZ);
++	ip_ct_refresh_acct(ct, ctinfo, *pskb, master_timeout * HZ);
+ 
+ 	/* No data? */
+ 	dataoff = (*pskb)->nh.iph->ihl*4 + sizeof(struct udphdr);
 Index: net/ipv4/netfilter/ip_conntrack_core.c
 ===================================================================
 --- net/ipv4/netfilter/ip_conntrack_core.c	(.../branches/vanilla-2.6.12.x)	(revision 6284)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-pom-ng-branch.diff?r1=1.1.2.17&r2=1.1.2.18&f=u