diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 07:57:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 07:57:32 -0400 |
| commit | 975439fe73d1f0f7ce8c235c66783bd34dc459c3 (patch) | |
| tree | 84e29852d96283b13c6e603f86bd506a631343c5 /net/sched/sch_htb.c | |
| parent | ef31023743e66de7184e9aad432291c842a6384b (diff) | |
| parent | 129d6aba444d1e99d4cbfb9866a4652912426b65 (diff) | |
Merge branch 'x86/amd-iommu' into x86/urgent
Diffstat (limited to 'net/sched/sch_htb.c')
| -rw-r--r-- | net/sched/sch_htb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index be35422711a3..6febd245e62b 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c | |||
| @@ -1279,7 +1279,8 @@ static int htb_delete(struct Qdisc *sch, unsigned long arg) | |||
| 1279 | 1279 | ||
| 1280 | /* delete from hash and active; remainder in destroy_class */ | 1280 | /* delete from hash and active; remainder in destroy_class */ |
| 1281 | qdisc_class_hash_remove(&q->clhash, &cl->common); | 1281 | qdisc_class_hash_remove(&q->clhash, &cl->common); |
| 1282 | cl->parent->children--; | 1282 | if (cl->parent) |
| 1283 | cl->parent->children--; | ||
| 1283 | 1284 | ||
| 1284 | if (cl->prio_activity) | 1285 | if (cl->prio_activity) |
| 1285 | htb_deactivate(q, cl); | 1286 | htb_deactivate(q, cl); |