pkt_sched: Remove 'dev' member of struct Qdisc.
It can be obtained via the netdev_queue. So create a helper routine, qdisc_dev(), to make the transformations nicer looking. Now, qdisc_alloc() now no longer needs a net_device pointer argument. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -1045,7 +1045,7 @@ hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
|
||||
|
||||
if (tca[TCA_RATE])
|
||||
gen_replace_estimator(&cl->bstats, &cl->rate_est,
|
||||
&sch->dev->queue_lock,
|
||||
&qdisc_dev(sch)->queue_lock,
|
||||
tca[TCA_RATE]);
|
||||
return 0;
|
||||
}
|
||||
@@ -1083,7 +1083,7 @@ hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
|
||||
cl->refcnt = 1;
|
||||
cl->sched = q;
|
||||
cl->cl_parent = parent;
|
||||
cl->qdisc = qdisc_create_dflt(sch->dev, sch->dev_queue,
|
||||
cl->qdisc = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,
|
||||
&pfifo_qdisc_ops, classid);
|
||||
if (cl->qdisc == NULL)
|
||||
cl->qdisc = &noop_qdisc;
|
||||
@@ -1104,7 +1104,7 @@ hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
|
||||
|
||||
if (tca[TCA_RATE])
|
||||
gen_new_estimator(&cl->bstats, &cl->rate_est,
|
||||
&sch->dev->queue_lock, tca[TCA_RATE]);
|
||||
&qdisc_dev(sch)->queue_lock, tca[TCA_RATE]);
|
||||
*arg = (unsigned long)cl;
|
||||
return 0;
|
||||
}
|
||||
@@ -1202,7 +1202,7 @@ hfsc_graft_class(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
|
||||
if (cl->level > 0)
|
||||
return -EINVAL;
|
||||
if (new == NULL) {
|
||||
new = qdisc_create_dflt(sch->dev, sch->dev_queue,
|
||||
new = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,
|
||||
&pfifo_qdisc_ops,
|
||||
cl->cl_common.classid);
|
||||
if (new == NULL)
|
||||
@@ -1445,7 +1445,7 @@ hfsc_init_qdisc(struct Qdisc *sch, struct nlattr *opt)
|
||||
q->root.cl_common.classid = sch->handle;
|
||||
q->root.refcnt = 1;
|
||||
q->root.sched = q;
|
||||
q->root.qdisc = qdisc_create_dflt(sch->dev, sch->dev_queue,
|
||||
q->root.qdisc = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,
|
||||
&pfifo_qdisc_ops,
|
||||
sch->handle);
|
||||
if (q->root.qdisc == NULL)
|
||||
|
Reference in New Issue
Block a user