commit 980c478ddbb720948967b028ddbb4179a025bc2c
author Jarek Poplawski <jarkao2@gmail.com> Tue Apr 29 03:29:03 2008 -0700
committer David S. Miller <davem@davemloft.net> Tue Apr 29 03:29:03 2008 -0700
tree 0a0568de2af7e9daea8d5473f62b9dc470647f9a
parent 42908c69f61f75dd70e424263ab89ee52040382b

sch_sfq: use del_timer_sync() in sfq_destroy()

Let's delete timer reliably in sfq_destroy().

Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/sched/sch_sfq.c

diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index a20e2ef..f0463d7 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -521,7 +521,8 @@
 	struct sfq_sched_data *q = qdisc_priv(sch);
 
 	tcf_destroy_chain(q->filter_list);
-	del_timer(&q->perturb_timer);
+	q->perturb_period = 0;
+	del_timer_sync(&q->perturb_timer);
 }
 
 static int sfq_dump(struct Qdisc *sch, struct sk_buff *skb)