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

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

diff --git a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
index 463cafa66..73fe0401d 100644
--- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
@@ -225,7 +225,7 @@ static int tcp_packet(struct ip_conntrack *conntrack,
 		set_bit(IPS_ASSURED_BIT, &conntrack->status);
 
 out:	WRITE_UNLOCK(&tcp_lock);
-	ip_ct_refresh(conntrack, *tcp_timeouts[newconntrack]);
+	ip_ct_refresh_acct(conntrack, ctinfo, skb, *tcp_timeouts[newconntrack]);
 
 	return NF_ACCEPT;
 }