aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_generic.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/sched/sch_generic.c')
-rw-r--r--net/sched/sch_generic.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 0abcc492fbf9..5dbb3cd96e59 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -576,10 +576,8 @@ errout:
576 return ERR_PTR(err); 576 return ERR_PTR(err);
577} 577}
578 578
579struct Qdisc * qdisc_create_dflt(struct net_device *dev, 579struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue,
580 struct netdev_queue *dev_queue, 580 struct Qdisc_ops *ops, unsigned int parentid)
581 struct Qdisc_ops *ops,
582 unsigned int parentid)
583{ 581{
584 struct Qdisc *sch; 582 struct Qdisc *sch;
585 583
@@ -684,7 +682,7 @@ static void attach_one_default_qdisc(struct net_device *dev,
684 struct Qdisc *qdisc; 682 struct Qdisc *qdisc;
685 683
686 if (dev->tx_queue_len) { 684 if (dev->tx_queue_len) {
687 qdisc = qdisc_create_dflt(dev, dev_queue, 685 qdisc = qdisc_create_dflt(dev_queue,
688 &pfifo_fast_ops, TC_H_ROOT); 686 &pfifo_fast_ops, TC_H_ROOT);
689 if (!qdisc) { 687 if (!qdisc) {
690 printk(KERN_INFO "%s: activation failed\n", dev->name); 688 printk(KERN_INFO "%s: activation failed\n", dev->name);
@@ -711,7 +709,7 @@ static void attach_default_qdiscs(struct net_device *dev)
711 dev->qdisc = txq->qdisc_sleeping; 709 dev->qdisc = txq->qdisc_sleeping;
712 atomic_inc(&dev->qdisc->refcnt); 710 atomic_inc(&dev->qdisc->refcnt);
713 } else { 711 } else {
714 qdisc = qdisc_create_dflt(dev, txq, &mq_qdisc_ops, TC_H_ROOT); 712 qdisc = qdisc_create_dflt(txq, &mq_qdisc_ops, TC_H_ROOT);
715 if (qdisc) { 713 if (qdisc) {
716 qdisc->ops->attach(qdisc); 714 qdisc->ops->attach(qdisc);
717 dev->qdisc = qdisc; 715 dev->qdisc = qdisc;