Re: [PATCH][NET_SCHED] sch_htb: turn intermediate classes into leaves

[Jarek Poplawski <jarkao2@o2.pl>]

On Thu, Nov 30, 2006 at 01:26:34PM +0100, Patrick McHardy wrote:
> Jarek Poplawski wrote:
> > [NET_SCHED] sch_htb:
> > 
> > [PATCH 2.6.19-rc6 with "Fix endless loops" set of patches]
> > 
> > - turn intermediate classes into leaves again when their
> >   last child is deleted (struct htb_class changed)
> 
> Looks good to me too, but it still seems to be missing
> class level adjustment after deletion. The classification
> function refuses to queue packets to classes with level > 0.

+static void htb_parent_to_leaf(struct htb_class *cl, struct Qdisc *new_q)
+{
+	struct htb_class *parent = cl->parent;
+
+	BUG_TRAP(!cl->level && cl->un.leaf.q && !cl->prio_activity);
+
+	parent->level = 0;

I've thought this is enough, but probably you mean something
else? 

Jarek P.