diff options
Diffstat (limited to 'net/sched')
-rw-r--r-- | net/sched/sch_hfsc.c | 4 | ||||
-rw-r--r-- | net/sched/sch_htb.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index 396deb71480f..407c6fb1ba14 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c | |||
@@ -1184,10 +1184,12 @@ hfsc_delete_class(struct Qdisc *sch, unsigned long arg) | |||
1184 | 1184 | ||
1185 | sch_tree_lock(sch); | 1185 | sch_tree_lock(sch); |
1186 | 1186 | ||
1187 | list_del(&cl->hlist); | ||
1188 | list_del(&cl->siblings); | 1187 | list_del(&cl->siblings); |
1189 | hfsc_adjust_levels(cl->cl_parent); | 1188 | hfsc_adjust_levels(cl->cl_parent); |
1189 | |||
1190 | hfsc_purge_queue(sch, cl); | 1190 | hfsc_purge_queue(sch, cl); |
1191 | list_del(&cl->hlist); | ||
1192 | |||
1191 | if (--cl->refcnt == 0) | 1193 | if (--cl->refcnt == 0) |
1192 | hfsc_destroy_class(sch, cl); | 1194 | hfsc_destroy_class(sch, cl); |
1193 | 1195 | ||
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 97cbb9aec946..3c3294d01041 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c | |||
@@ -1380,15 +1380,15 @@ static int htb_delete(struct Qdisc *sch, unsigned long arg) | |||
1380 | 1380 | ||
1381 | sch_tree_lock(sch); | 1381 | sch_tree_lock(sch); |
1382 | 1382 | ||
1383 | /* delete from hash and active; remainder in destroy_class */ | ||
1384 | hlist_del_init(&cl->hlist); | ||
1385 | |||
1386 | if (!cl->level) { | 1383 | if (!cl->level) { |
1387 | qlen = cl->un.leaf.q->q.qlen; | 1384 | qlen = cl->un.leaf.q->q.qlen; |
1388 | qdisc_reset(cl->un.leaf.q); | 1385 | qdisc_reset(cl->un.leaf.q); |
1389 | qdisc_tree_decrease_qlen(cl->un.leaf.q, qlen); | 1386 | qdisc_tree_decrease_qlen(cl->un.leaf.q, qlen); |
1390 | } | 1387 | } |
1391 | 1388 | ||
1389 | /* delete from hash and active; remainder in destroy_class */ | ||
1390 | hlist_del_init(&cl->hlist); | ||
1391 | |||
1392 | if (cl->prio_activity) | 1392 | if (cl->prio_activity) |
1393 | htb_deactivate(q, cl); | 1393 | htb_deactivate(q, cl); |
1394 | 1394 | ||