git://git.onelab.eu
/
linux-2.6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3dbaf57
)
- merge revision 1.3
author
Mark Huang
<mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:47:09 +0000
(20:47 +0000)
committer
Mark Huang
<mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:47:09 +0000
(20:47 +0000)
date: 2005/01/10 18:34:43; author: mlhuang; state: Exp; lines: +1 -1
patch-o-matic-ng-
20050103
conntrack-acct
net/ipv4/netfilter/ip_conntrack_amanda.c
patch
|
blob
|
history
diff --git
a/net/ipv4/netfilter/ip_conntrack_amanda.c
b/net/ipv4/netfilter/ip_conntrack_amanda.c
index
4e8f4d8
..
40ed447
100644
(file)
--- 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);