From: Patrick McHardy <kaber@trash.net>
Date: Sat, 13 Jun 2009 10:21:49 +0000 (+0200)
Subject: netfilter: nf_conntrack: use mod_timer_pending() for conntrack refresh
X-Git-Tag: v2.6.31-rc1~330^2~19^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65cb9fda32be613216f601a330b311c3bd7a8436;p=pandora-kernel.git

netfilter: nf_conntrack: use mod_timer_pending() for conntrack refresh

Use mod_timer_pending() instead of atomic sequence of del_timer()/
add_timer(). mod_timer_pending() does not rearm an inactive timer,
so we don't need the conntrack lock anymore to make sure we don't
accidentally rearm a timer of a conntrack which is in the process
of being destroyed.

With this change, we don't need to take the global lock anymore at all,
counter updates can be performed under the per-conntrack lock.

Signed-off-by: Patrick McHardy <kaber@trash.net>
---

Reading git-diff-tree failed