From 48225acda2a9c5646a1ba212c3f01a84f473f5bd Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Thu, 31 Jul 2008 00:38:52 -0700 Subject: [PATCH] --- yaml --- r: 107349 b: refs/heads/master c: 967ab999a090b1a4e7d3c7febfd6d89b42fb4cf4 h: refs/heads/master i: 107347: 2fd9a7bf307a73d09999b1ce2df4fad945cf9f80 v: v3 --- [refs] | 2 +- trunk/net/netfilter/xt_hashlimit.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3bc69ae42312..725d04424b9f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8ddc9163c6a16cd62531dba1ec5020484e33b02 +refs/heads/master: 967ab999a090b1a4e7d3c7febfd6d89b42fb4cf4 diff --git a/trunk/net/netfilter/xt_hashlimit.c b/trunk/net/netfilter/xt_hashlimit.c index 6809af542a2c..d9418a267812 100644 --- a/trunk/net/netfilter/xt_hashlimit.c +++ b/trunk/net/netfilter/xt_hashlimit.c @@ -367,9 +367,7 @@ static void htable_gc(unsigned long htlong) static void htable_destroy(struct xt_hashlimit_htable *hinfo) { - /* remove timer, if it is pending */ - if (timer_pending(&hinfo->timer)) - del_timer(&hinfo->timer); + del_timer_sync(&hinfo->timer); /* remove proc entry */ remove_proc_entry(hinfo->pde->name,