aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/nf_conntrack_helper.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2009-06-13 12:21:49 +0200
committerPatrick McHardy <kaber@trash.net>2009-06-13 12:21:49 +0200
commit65cb9fda32be613216f601a330b311c3bd7a8436 (patch)
tree3ba0ae9cbd474723f47e5ea8f1d21e212381c135 /net/netfilter/nf_conntrack_helper.c
parentnetfilter: nf_log: fix sleeping function called from invalid context (diff)
downloadlinux-dev-65cb9fda32be613216f601a330b311c3bd7a8436.tar.xz
linux-dev-65cb9fda32be613216f601a330b311c3bd7a8436.zip
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>
Diffstat (limited to 'net/netfilter/nf_conntrack_helper.c')
0 files changed, 0 insertions, 0 deletions