[PATCH 2.6.19-rc4-git10][PKT_SCHED] sch_htb: INIT_HLIST_NODE after hlist_del()

[Jarek Poplawski]

After hlist_del() next and pprev pointers are not NULL
so hlist_unhashed() doesn't work properly.


Signed-off-by: Jarek Poplawski <[EMAIL PROTECTED]>
---


diff -Nurp linux-2.6.19-rc4-git10-/net/sched/sch_htb.c 
linux-2.6.19-rc4-git10/net/sched/sch_htb.c
--- linux-2.6.19-rc4-git10-/net/sched/sch_htb.c 2006-11-06 11:42:41.000000000 
+0100
+++ linux-2.6.19-rc4-git10/net/sched/sch_htb.c  2006-11-06 11:53:15.000000000 
+0100
@@ -1284,8 +1284,10 @@ static void htb_destroy_class(struct Qdi
                                                  struct htb_class, sibling));
 
        /* note: this delete may happen twice (see htb_delete) */
-       if (!hlist_unhashed(&cl->hlist))
+       if (!hlist_unhashed(&cl->hlist)) {
                hlist_del(&cl->hlist);
+               INIT_HLIST_NODE(&cl->hlist);
+       }
        list_del(&cl->sibling);
 
        if (cl->prio_activity)
@@ -1333,8 +1335,10 @@ static int htb_delete(struct Qdisc *sch,
        sch_tree_lock(sch);
 
        /* delete from hash and active; remainder in destroy_class */
-       if (!hlist_unhashed(&cl->hlist))
+       if (!hlist_unhashed(&cl->hlist)) {
                hlist_del(&cl->hlist);
+               INIT_HLIST_NODE(&cl->hlist);
+       }
 
        if (cl->prio_activity)
                htb_deactivate(q, cl);
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html