From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Thu, 27 Jan 2005 20:47:09 +0000 (+0000)
Subject: - merge revision 1.3
X-Git-Tag: planetlab-3_0-rc10~18
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=cbbc290c1c59e788c003dbbf9b64c01ca6c05cba;p=linux-2.6.git

- merge revision 1.3
date: 2005/01/10 18:34:43;  author: mlhuang;  state: Exp;  lines: +1 -1
patch-o-matic-ng-20050103 conntrack-acct
---

diff --git a/net/ipv4/netfilter/ip_conntrack_amanda.c b/net/ipv4/netfilter/ip_conntrack_amanda.c
index 4e8f4d83b..40ed4474d 100644
--- a/net/ipv4/netfilter/ip_conntrack_amanda.c
+++ b/net/ipv4/netfilter/ip_conntrack_amanda.c
@@ -58,7 +58,7 @@ static int help(struct sk_buff *skb,
 
 	/* increase the UDP timeout of the master connection as replies from
 	 * Amanda clients to the server can be quite delayed */
-	ip_ct_refresh(ct, master_timeout * HZ);
+	ip_ct_refresh_acct(ct, ctinfo, NULL, master_timeout * HZ);
 
 	/* No data? */
 	dataoff = skb->nh.iph->ihl*4 + sizeof(struct udphdr);