Commit 47d95045 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller

[NETFILTER]: nf_conntrack: fix accounting with fixed timeouts

Don't skip accounting for conntracks with the FIXED_TIMEOUT bit.
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1d670fdc
...@@ -776,10 +776,8 @@ void __nf_ct_refresh_acct(struct nf_conn *ct, ...@@ -776,10 +776,8 @@ void __nf_ct_refresh_acct(struct nf_conn *ct,
write_lock_bh(&nf_conntrack_lock); write_lock_bh(&nf_conntrack_lock);
/* Only update if this is not a fixed timeout */ /* Only update if this is not a fixed timeout */
if (test_bit(IPS_FIXED_TIMEOUT_BIT, &ct->status)) { if (test_bit(IPS_FIXED_TIMEOUT_BIT, &ct->status))
write_unlock_bh(&nf_conntrack_lock); goto acct;
return;
}
/* If not in hash table, timer will not be active yet */ /* If not in hash table, timer will not be active yet */
if (!nf_ct_is_confirmed(ct)) { if (!nf_ct_is_confirmed(ct)) {
...@@ -799,6 +797,7 @@ void __nf_ct_refresh_acct(struct nf_conn *ct, ...@@ -799,6 +797,7 @@ void __nf_ct_refresh_acct(struct nf_conn *ct,
} }
} }
acct:
#ifdef CONFIG_NF_CT_ACCT #ifdef CONFIG_NF_CT_ACCT
if (do_acct) { if (do_acct) {
ct->counters[CTINFO2DIR(ctinfo)].packets++; ct->counters[CTINFO2DIR(ctinfo)].packets++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment