aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_cbq.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/sched/sch_cbq.c')
-rw-r--r--net/sched/sch_cbq.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index 968b4c73c9c1..d360dcd0818b 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -1401,7 +1401,8 @@ static int cbq_init(struct Qdisc *sch, struct nlattr *opt)
1401 q->link.sibling = &q->link; 1401 q->link.sibling = &q->link;
1402 q->link.common.classid = sch->handle; 1402 q->link.common.classid = sch->handle;
1403 q->link.qdisc = sch; 1403 q->link.qdisc = sch;
1404 if (!(q->link.q = qdisc_create_dflt(sch->dev, &pfifo_qdisc_ops, 1404 if (!(q->link.q = qdisc_create_dflt(sch->dev, sch->dev_queue,
1405 &pfifo_qdisc_ops,
1405 sch->handle))) 1406 sch->handle)))
1406 q->link.q = &noop_qdisc; 1407 q->link.q = &noop_qdisc;
1407 1408
@@ -1645,7 +1646,8 @@ static int cbq_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
1645 1646
1646 if (cl) { 1647 if (cl) {
1647 if (new == NULL) { 1648 if (new == NULL) {
1648 new = qdisc_create_dflt(sch->dev, &pfifo_qdisc_ops, 1649 new = qdisc_create_dflt(sch->dev, sch->dev_queue,
1650 &pfifo_qdisc_ops,
1649 cl->common.classid); 1651 cl->common.classid);
1650 if (new == NULL) 1652 if (new == NULL)
1651 return -ENOBUFS; 1653 return -ENOBUFS;
@@ -1877,7 +1879,8 @@ cbq_change_class(struct Qdisc *sch, u32 classid, u32 parentid, struct nlattr **t
1877 cl->R_tab = rtab; 1879 cl->R_tab = rtab;
1878 rtab = NULL; 1880 rtab = NULL;
1879 cl->refcnt = 1; 1881 cl->refcnt = 1;
1880 if (!(cl->q = qdisc_create_dflt(sch->dev, &pfifo_qdisc_ops, classid))) 1882 if (!(cl->q = qdisc_create_dflt(sch->dev, sch->dev_queue,
1883 &pfifo_qdisc_ops, classid)))
1881 cl->q = &noop_qdisc; 1884 cl->q = &noop_qdisc;
1882 cl->common.classid = classid; 1885 cl->common.classid = classid;
1883 cl->tparent = parent; 1886 cl->tparent = parent;