From 36b3e2a0beab452c1ba6b191dad515034a65785e Mon Sep 17 00:00:00 2001 From: Jarek Poplawski Date: Tue, 29 Apr 2008 03:29:03 -0700 Subject: [PATCH] --- yaml --- r: 95392 b: refs/heads/master c: 980c478ddbb720948967b028ddbb4179a025bc2c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/sched/sch_sfq.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cff95249dae3..27a05fefb05a 100644 --- 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 index a20e2ef7704b..f0463d757a98 100644 --- 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)