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

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

diff --git a/net/ipv4/netfilter/ip_conntrack_proto_generic.c b/net/ipv4/netfilter/ip_conntrack_proto_generic.c
index 0df558a58..6a7db7754 100644
--- a/net/ipv4/netfilter/ip_conntrack_proto_generic.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_generic.c
@@ -50,9 +50,9 @@ static unsigned int generic_print_conntrack(char *buffer,
 /* Returns verdict for packet, or -1 for invalid. */
 static int packet(struct ip_conntrack *conntrack,
 		  const struct sk_buff *skb,
-		  enum ip_conntrack_info conntrackinfo)
+		  enum ip_conntrack_info ctinfo)
 {
-	ip_ct_refresh(conntrack, ip_ct_generic_timeout);
+	ip_ct_refresh_acct(conntrack, ctinfo, skb, ip_ct_generic_timeout);
 	return NF_ACCEPT;
 }