diff options
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/wme.c | 6 |
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; |