summaryrefslogtreecommitdiffstats
path: root/net/sched/sch_generic.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-18 22:50:15 -0700
committerDavid S. Miller <davem@davemloft.net>2008-07-18 22:50:15 -0700
commit3072367300aa8c779e3a14ee8e89de079e90f3ad (patch)
tree7f74c5b8fdb300532fbbc83ba00d6d1d17af020e /net/sched/sch_generic.c
parent72b25a913ed9b1ab49c7022adaf3f271a65ea219 (diff)
downloadlinux-3072367300aa8c779e3a14ee8e89de079e90f3ad.tar.gz
linux-3072367300aa8c779e3a14ee8e89de079e90f3ad.tar.bz2
linux-3072367300aa8c779e3a14ee8e89de079e90f3ad.zip
pkt_sched: Manage qdisc list inside of root qdisc.
Idea is from Patrick McHardy. Instead of managing the list of qdiscs on the device level, manage it in the root qdisc of a netdev_queue. This solves all kinds of visibility issues during qdisc destruction. The way to iterate over all qdiscs of a netdev_queue is to visit the netdev_queue->qdisc, and then traverse it's list. The only special case is to ignore builting qdiscs at the root when dumping or doing a qdisc_lookup(). That was not needed previously because builtin qdiscs were not added to the device's qdisc_list. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_generic.c')
-rw-r--r--net/sched/sch_generic.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index e244c462e6bd..14cc443d0490 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -480,15 +480,12 @@ static void __qdisc_destroy(struct rcu_head *head)
void qdisc_destroy(struct Qdisc *qdisc)
{
- struct net_device *dev = qdisc_dev(qdisc);
-
if (qdisc->flags & TCQ_F_BUILTIN ||
!atomic_dec_and_test(&qdisc->refcnt))
return;
- spin_lock_bh(&dev->qdisc_list_lock);
- list_del(&qdisc->list);
- spin_unlock_bh(&dev->qdisc_list_lock);
+ if (qdisc->parent)
+ list_del(&qdisc->list);
call_rcu(&qdisc->q_rcu, __qdisc_destroy);
}
@@ -520,9 +517,6 @@ static void attach_one_default_qdisc(struct net_device *dev,
printk(KERN_INFO "%s: activation failed\n", dev->name);
return;
}
- spin_lock_bh(&dev->qdisc_list_lock);
- list_add_tail(&qdisc->list, &dev->qdisc_list);
- spin_unlock_bh(&dev->qdisc_list_lock);
} else {
qdisc = &noqueue_qdisc;
}