aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-08 19:55:56 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-08 19:55:56 -0400
commitbb949fbd1878973c3539d9aecff52f284482a937 (patch)
treee8bde854b18be79723502167c16e2131914a75b7 /net/mac80211
parente65d22e18038eed7307276e46810d884c402d57d (diff)
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>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/wme.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index 5c666f7eda8f..770f1c09b793 100644
--- a/net/mac80211/wme.c
+++ b/net/mac80211/wme.c
@@ -359,7 +359,8 @@ static int wme_qdiscop_init(struct Qdisc *qd, struct nlattr *opt)
359 /* create child queues */ 359 /* create child queues */
360 for (i = 0; i < QD_NUM(hw); i++) { 360 for (i = 0; i < QD_NUM(hw); i++) {
361 skb_queue_head_init(&q->requeued[i]); 361 skb_queue_head_init(&q->requeued[i]);
362 q->queues[i] = qdisc_create_dflt(qd->dev, &pfifo_qdisc_ops, 362 q->queues[i] = qdisc_create_dflt(qd->dev, qd->dev_queue,
363 &pfifo_qdisc_ops,
363 qd->handle); 364 qd->handle);
364 if (!q->queues[i]) { 365 if (!q->queues[i]) {
365 q->queues[i] = &noop_qdisc; 366 q->queues[i] = &noop_qdisc;
@@ -575,7 +576,8 @@ void ieee80211_install_qdisc(struct net_device *dev)
575{ 576{
576 struct Qdisc *qdisc; 577 struct Qdisc *qdisc;
577 578
578 qdisc = qdisc_create_dflt(dev, &wme_qdisc_ops, TC_H_ROOT); 579 qdisc = qdisc_create_dflt(dev, &dev->tx_queue,
580 &wme_qdisc_ops, TC_H_ROOT);
579 if (!qdisc) { 581 if (!qdisc) {
580 printk(KERN_ERR "%s: qdisc installation failed\n", dev->name); 582 printk(KERN_ERR "%s: qdisc installation failed\n", dev->name);
581 return; 583 return;