diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-07-01 19:53:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-01 19:53:09 -0700 |
| commit | a4aebb83cf0da0363684f1c339f7e6149a3e74c1 (patch) | |
| tree | b009adf7577ff4822ede398b1a162374ce32fb81 | |
| parent | ff31ab56c0e900235f653e375fc3b01ba2d8d6a3 (diff) | |
| download | linux-a4aebb83cf0da0363684f1c339f7e6149a3e74c1.tar.gz linux-a4aebb83cf0da0363684f1c339f7e6149a3e74c1.tar.bz2 linux-a4aebb83cf0da0363684f1c339f7e6149a3e74c1.zip | |
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 <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/sched/sch_atm.c | 4 | ||||
| -rw-r--r-- | net/sched/sch_hfsc.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c index 8e5f70ba3a15..db0e23ae85f8 100644 --- a/net/sched/sch_atm.c +++ b/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/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index eca83a3be293..e817aa00441d 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c @@ -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); } |