From a799d9297dd48f7122c1dd0e3a34f91066f62e65 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 7 Nov 2006 14:54:46 -0800 Subject: [PATCH] --- yaml --- r: 40803 b: refs/heads/master c: da33e3eb4876c43b78fdc7b7068653239f28714a h: refs/heads/master i: 40801: 126a590f1208bfdfacd189248bc214d5deef48f0 40799: 7a80950326353706f5cfbf70fbde94f19eecb0bf v: v3 --- [refs] | 2 +- trunk/net/sched/sch_htb.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ec8c7c4a7e00..b24f1938ceca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e950efa20dc8037c27509666cba6999da9368e8 +refs/heads/master: da33e3eb4876c43b78fdc7b7068653239f28714a diff --git a/trunk/net/sched/sch_htb.c b/trunk/net/sched/sch_htb.c index 9b9c555c713f..4b52fa78935a 100644 --- a/trunk/net/sched/sch_htb.c +++ b/trunk/net/sched/sch_htb.c @@ -1284,8 +1284,7 @@ static void htb_destroy_class(struct Qdisc *sch, struct htb_class *cl) struct htb_class, sibling)); /* note: this delete may happen twice (see htb_delete) */ - if (!hlist_unhashed(&cl->hlist)) - hlist_del(&cl->hlist); + hlist_del_init(&cl->hlist); list_del(&cl->sibling); if (cl->prio_activity) @@ -1333,8 +1332,7 @@ static int htb_delete(struct Qdisc *sch, unsigned long arg) sch_tree_lock(sch); /* delete from hash and active; remainder in destroy_class */ - if (!hlist_unhashed(&cl->hlist)) - hlist_del(&cl->hlist); + hlist_del_init(&cl->hlist); if (cl->prio_activity) htb_deactivate(q, cl);