From af9b0bdef9468e3edfbf46ba0a1ba1fb6badb615 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Tue, 5 Jun 2007 16:06:59 -0700
Subject: [PATCH] --- yaml --- r: 57439 b: refs/heads/master c:
 b00b4bf94edb42852d55619af453588b2de2dc5e h: refs/heads/master i:   57437:
 c5fd58250de79adb767648165f9ebb20afd2dffb   57435:
 6e3d5d756805984f9ee11919b3c4ec06ad8c6b2c   57431:
 86ea2494db3585c22b9b0181571d6f0d55ba35fe   57423:
 2ca2766f9dafab08e33533f8bb60a4f2a903a420   57407:
 6b51bf8369e55a90ae9df17bfd957c2ea750d557 v: v3

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

diff --git a/[refs] b/[refs]
index ba6fa0e70413..5ab27a2504ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c355f532dd43036622e1880c114773463bafd23
+refs/heads/master: b00b4bf94edb42852d55619af453588b2de2dc5e
diff --git a/trunk/net/sched/sch_atm.c b/trunk/net/sched/sch_atm.c
index be7d299acd73..d1c383fca82c 100644
--- a/trunk/net/sched/sch_atm.c
+++ b/trunk/net/sched/sch_atm.c
@@ -599,6 +599,7 @@ static void atm_tc_destroy(struct Qdisc *sch)
 	/* races ? */
 	while ((flow = p->flows)) {
 		tcf_destroy_chain(flow->filter_list);
+		flow->filter_list = NULL;
 		if (flow->ref > 1)
 			printk(KERN_ERR "atm_destroy: %p->ref = %d\n",flow,
 			    flow->ref);
diff --git a/trunk/net/sched/sch_cbq.c b/trunk/net/sched/sch_cbq.c
index a294542cb8e4..ee2d5967d109 100644
--- a/trunk/net/sched/sch_cbq.c
+++ b/trunk/net/sched/sch_cbq.c
@@ -1748,10 +1748,12 @@ cbq_destroy(struct Qdisc* sch)
 	 * classes from root to leafs which means that filters can still
 	 * be bound to classes which have been destroyed already. --TGR '04
 	 */
-	for (h = 0; h < 16; h++)
-		for (cl = q->classes[h]; cl; cl = cl->next)
+	for (h = 0; h < 16; h++) {
+		for (cl = q->classes[h]; cl; cl = cl->next) {
 			tcf_destroy_chain(cl->filter_list);
-
+			cl->filter_list = NULL;
+		}
+	}
 	for (h = 0; h < 16; h++) {
 		struct cbq_class *next;