netdev: Create netdev_queue abstraction.
A netdev_queue is an entity managed by a qdisc. Currently there is one RX and one TX queue, and a netdev_queue merely contains a backpointer to the net_device. The Qdisc struct is augmented with a netdev_queue pointer as well. Eventually the 'dev' Qdisc member will go away and we will have the resulting hierarchy: net_device --> netdev_queue --> Qdisc Also, qdisc_alloc() and qdisc_create_dflt() now take a netdev_queue pointer argument. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@ -1129,7 +1129,8 @@ static int htb_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
|
||||
|
||||
if (cl && !cl->level) {
|
||||
if (new == NULL &&
|
||||
(new = qdisc_create_dflt(sch->dev, &pfifo_qdisc_ops,
|
||||
(new = qdisc_create_dflt(sch->dev, sch->dev_queue,
|
||||
&pfifo_qdisc_ops,
|
||||
cl->common.classid))
|
||||
== NULL)
|
||||
return -ENOBUFS;
|
||||
@ -1256,8 +1257,9 @@ static int htb_delete(struct Qdisc *sch, unsigned long arg)
|
||||
return -EBUSY;
|
||||
|
||||
if (!cl->level && htb_parent_last_child(cl)) {
|
||||
new_q = qdisc_create_dflt(sch->dev, &pfifo_qdisc_ops,
|
||||
cl->parent->common.classid);
|
||||
new_q = qdisc_create_dflt(sch->dev, sch->dev_queue,
|
||||
&pfifo_qdisc_ops,
|
||||
cl->parent->common.classid);
|
||||
last_child = 1;
|
||||
}
|
||||
|
||||
@ -1376,7 +1378,8 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
|
||||
/* create leaf qdisc early because it uses kmalloc(GFP_KERNEL)
|
||||
so that can't be used inside of sch_tree_lock
|
||||
-- thanks to Karlis Peisenieks */
|
||||
new_q = qdisc_create_dflt(sch->dev, &pfifo_qdisc_ops, classid);
|
||||
new_q = qdisc_create_dflt(sch->dev, sch->dev_queue,
|
||||
&pfifo_qdisc_ops, classid);
|
||||
sch_tree_lock(sch);
|
||||
if (parent && !parent->level) {
|
||||
unsigned int qlen = parent->un.leaf.q->q.qlen;
|
||||
|
Reference in New Issue
Block a user