From 292351683cafc4a220835a5d6966043b1953b85f Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Wed, 29 Nov 2006 17:34:50 -0800
Subject: [PATCH] --- yaml --- r: 41947 b: refs/heads/master c:
 814a175e7b1531a4bcaa63be47bf58cacdcb5010 h: refs/heads/master i:   41945:
 ba5c490031141f1df543602978909caf30a4d5a0   41943:
 b6a4a881787888c27bd4b53c56df69804837093b v: v3

---
 [refs]                    | 2 +-
 trunk/net/sched/sch_htb.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 18ea34d8789b..e50f003b58af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cbda6b6e2e2a0a84c0fcda8ea262c16d7a63fc8
+refs/heads/master: 814a175e7b1531a4bcaa63be47bf58cacdcb5010
diff --git a/trunk/net/sched/sch_htb.c b/trunk/net/sched/sch_htb.c
index 4b52fa78935a..08fa4d083615 100644
--- a/trunk/net/sched/sch_htb.c
+++ b/trunk/net/sched/sch_htb.c
@@ -1269,9 +1269,9 @@ static void htb_destroy_filters(struct tcf_proto **fl)
 static void htb_destroy_class(struct Qdisc *sch, struct htb_class *cl)
 {
 	struct htb_sched *q = qdisc_priv(sch);
+
 	if (!cl->level) {
 		BUG_TRAP(cl->un.leaf.q);
-		sch->q.qlen -= cl->un.leaf.q->q.qlen;
 		qdisc_destroy(cl->un.leaf.q);
 	}
 	qdisc_put_rtab(cl->rate);
@@ -1334,6 +1334,11 @@ static int htb_delete(struct Qdisc *sch, unsigned long arg)
 	/* delete from hash and active; remainder in destroy_class */
 	hlist_del_init(&cl->hlist);
 
+	if (!cl->level) {
+		sch->q.qlen -= cl->un.leaf.q->q.qlen;
+		qdisc_reset(cl->un.leaf.q);
+	}
+
 	if (cl->prio_activity)
 		htb_deactivate(q, cl);