net-sched 02/02: fix filter destruction in atm/hfsc qdisc destruction

PATCH Patrick McHardy 1 participant 1 message Jul 1, 2008

Subsystems (3)

Networking Network drivers Traffic control (tc)

lore

Share & tools

lore

Patrick McHardy

author

2008-07-01 10:06 UTC #0 lore raw

commit 096191c2ded6435a9a22fe0e2ee494b6e7686f95

Author: Patrick McHardy <[email protected]>
Date:   Thu Jun 26 18:55:20 2008 +0200

net-sched: fix filter destruction in atm/hfsc qdisc destruction

Filters need to be destroyed before beginning to destroy classes since the destination class needs to still be alive to unbind the filter.

Signed-off-by Patrick McHardy <[email protected]>

net/sched/sch_atm.c +3 -1

index 8e5f70b..db0e23a 100644
@@ -586,9 +586,11 @@ static void atm_tc_destroy(struct Qdisc *sch)
 	struct atm_flow_data *flow;
 
 	pr_debug("atm_tc_destroy(sch %p,[qdisc %p])\n", sch, p);
+	for (flow = p->flows; flow; flow = flow->next)
+		tcf_destroy_chain(&flow->filter_list);
+
 	/* races ? */
 	while ((flow = p->flows)) {
-		tcf_destroy_chain(&flow->filter_list);
 		if (flow->ref > 1)
 			printk(KERN_ERR "atm_destroy: %p->ref = %d\n", flow,
 			       flow->ref);

net/sched/sch_hfsc.c +4 -0

index eca83a3..e817aa0 100644
@@ -1541,6 +1541,10 @@ hfsc_destroy_qdisc(struct Qdisc *sch)
 	unsigned int i;
 
 	for (i = 0; i < HFSC_HSIZE; i++) {
+		list_for_each_entry(cl, &q->clhash[i], hlist)
+			tcf_destroy_chain(&cl->filter_list);
+	}
+	for (i = 0; i < HFSC_HSIZE; i++) {
 		list_for_each_entry_safe(cl, next, &q->clhash[i], hlist)
 			hfsc_destroy_class(sch, cl);
 	}