---

yaml --- r: 107349 b: refs/heads/master c: 967ab99 h: refs/heads/master i: 107347: 2fd9a7b v: v3
git-mirror · Jul 31, 2008 · 48225ac · 48225ac
1 parent c48002f
commit 48225ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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,