X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fsched%2Fsch_sfq.c;h=f0463d757a98489f5b12138c0026d1b91742fd9d;hb=2a5f2e3e6cd1ce9fb3f8b186b6bc9aa1f1497a92;hp=a20e2ef7704beb4142dc3ee75d67604bffa10a10;hpb=6208e77e7fa9e69f399fddc55b1cf9527fbde599;p=linux-2.6

diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index a20e2ef770..f0463d757a 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -521,7 +521,8 @@ static void sfq_destroy(struct Qdisc *sch)
 	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)