Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / net / sched / sch_drr.c

diff --git a/net/sched/sch_drr.c b/net/sched/sch_drr.c
index b74046a95397c6d2e3d9a90e648c3414dd18c50f..aa8b5313f8cf4d1a4a11e7077f9445fed11dd424 100644 (file)
--- a/net/sched/sch_drr.c
+++ b/net/sched/sch_drr.c
@@ -110,7 +110,7 @@ static int drr_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
        cl->refcnt         = 1;
        cl->common.classid = classid;
        cl->quantum        = quantum;
-       cl->qdisc          = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,
+       cl->qdisc          = qdisc_create_dflt(sch->dev_queue,
                                               &pfifo_qdisc_ops, classid);
        if (cl->qdisc == NULL)
                cl->qdisc = &noop_qdisc;
@@ -218,7 +218,7 @@ static int drr_graft_class(struct Qdisc *sch, unsigned long arg,
        struct drr_class *cl = (struct drr_class *)arg;
 
        if (new == NULL) {
-               new = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,
+               new = qdisc_create_dflt(sch->dev_queue,
                                        &pfifo_qdisc_ops, cl->common.classid);
                if (new == NULL)
                        new = &noop_qdisc;