---

yaml --- r: 95392 b: refs/heads/master c: 980c478 h: refs/heads/master v: v3
git-mirror · Apr 29, 2008 · 36b3e2a · 36b3e2a
1 parent 8b247b5
commit 36b3e2a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42908c69f61f75dd70e424263ab89ee52040382b
+refs/heads/master: 980c478ddbb720948967b028ddbb4179a025bc2c
diff --git a/trunk/net/sched/sch_sfq.c b/trunk/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)