netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_amanda.c

[baggins]

Author: baggins
Date: Fri Aug 26 17:53:06 2005
New Revision: 6336

Modified:
   netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_amanda.c
Log:
- skb cannot be NULL in ip_ct_refresh_acct call due to events patch


Modified: netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_amanda.c
==============================================================================
--- netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_amanda.c	(original)
+++ netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_amanda.c	Fri Aug 26 17:53:06 2005
@@ -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);