From 5b5e55905acce95b09f3c81a2aef909e481ad3f5 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Tue, 1 Jul 2008 19:53:09 -0700
Subject: [PATCH] --- yaml --- r: 98580 b: refs/heads/master c:
 a4aebb83cf0da0363684f1c339f7e6149a3e74c1 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/sched/sch_atm.c  | 4 +++-
 trunk/net/sched/sch_hfsc.c | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c8d8a9d43c68..343c2e2d28ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff31ab56c0e900235f653e375fc3b01ba2d8d6a3
+refs/heads/master: a4aebb83cf0da0363684f1c339f7e6149a3e74c1
diff --git a/trunk/net/sched/sch_atm.c b/trunk/net/sched/sch_atm.c
index 8e5f70ba3a15..db0e23ae85f8 100644
--- a/trunk/net/sched/sch_atm.c
+++ b/trunk/net/sched/sch_atm.c
@@ -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);
diff --git a/trunk/net/sched/sch_hfsc.c b/trunk/net/sched/sch_hfsc.c
index eca83a3be293..e817aa00441d 100644
--- a/trunk/net/sched/sch_hfsc.c
+++ b/trunk/net/sched/sch_hfsc.c
@@ -1540,6 +1540,10 @@ hfsc_destroy_qdisc(struct Qdisc *sch)
 	struct hfsc_class *cl, *next;
 	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);