* allow packet and byte counters to be replaced in NLM_F_REPLACE mode, allowing 'restore' to function properly Signed-off-by: Michael Zintakis <michael.zintakis@xxxxxxxxxxxxxx> --- net/netfilter/nfnetlink_acct.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/net/netfilter/nfnetlink_acct.c b/net/netfilter/nfnetlink_acct.c index 526abd7..c14046c 100644 --- a/net/netfilter/nfnetlink_acct.c +++ b/net/netfilter/nfnetlink_acct.c @@ -67,9 +67,16 @@ nfnl_acct_new(struct sock *nfnl, struct sk_buff *skb, if (matching) { if (nlh->nlmsg_flags & NLM_F_REPLACE) { - /* reset counters if you request a replacement. */ - atomic64_set(&matching->pkts, 0); - atomic64_set(&matching->bytes, 0); + /* (re)set counters if you request a replacement */ + if (tb[NFACCT_PKTS] && tb[NFACCT_BYTES]) { + atomic64_set(&matching->pkts, + be64_to_cpu(nla_get_be64(tb[NFACCT_PKTS]))); + atomic64_set(&matching->bytes, + be64_to_cpu(nla_get_be64(tb[NFACCT_BYTES]))); + } else { + atomic64_set(&matching->pkts, 0); + atomic64_set(&matching->bytes, 0); + } return 0; } return -EBUSY; -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html