net-sched: consolidate default fifo qdisc setup
Signed-off-by: Patrick McHardy <kaber@trash.net> Acked-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
aee18a8cf2
commit
fb0305ce1b
@@ -174,33 +174,6 @@ static void red_destroy(struct Qdisc *sch)
|
||||
qdisc_destroy(q->qdisc);
|
||||
}
|
||||
|
||||
static struct Qdisc *red_create_dflt(struct Qdisc *sch, u32 limit)
|
||||
{
|
||||
struct Qdisc *q;
|
||||
struct nlattr *nla;
|
||||
int ret;
|
||||
|
||||
q = qdisc_create_dflt(sch->dev, &bfifo_qdisc_ops,
|
||||
TC_H_MAKE(sch->handle, 1));
|
||||
if (q) {
|
||||
nla = kmalloc(nla_attr_size(sizeof(struct tc_fifo_qopt)),
|
||||
GFP_KERNEL);
|
||||
if (nla) {
|
||||
nla->nla_type = RTM_NEWQDISC;
|
||||
nla->nla_len = nla_attr_size(sizeof(struct tc_fifo_qopt));
|
||||
((struct tc_fifo_qopt *)nla_data(nla))->limit = limit;
|
||||
|
||||
ret = q->ops->change(q, nla);
|
||||
kfree(nla);
|
||||
|
||||
if (ret == 0)
|
||||
return q;
|
||||
}
|
||||
qdisc_destroy(q);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static const struct nla_policy red_policy[TCA_RED_MAX + 1] = {
|
||||
[TCA_RED_PARMS] = { .len = sizeof(struct tc_red_qopt) },
|
||||
[TCA_RED_STAB] = { .len = RED_STAB_SIZE },
|
||||
@@ -228,9 +201,9 @@ static int red_change(struct Qdisc *sch, struct nlattr *opt)
|
||||
ctl = nla_data(tb[TCA_RED_PARMS]);
|
||||
|
||||
if (ctl->limit > 0) {
|
||||
child = red_create_dflt(sch, ctl->limit);
|
||||
if (child == NULL)
|
||||
return -ENOMEM;
|
||||
child = fifo_create_dflt(sch, &bfifo_qdisc_ops, ctl->limit);
|
||||
if (IS_ERR(child))
|
||||
return PTR_ERR(child);
|
||||
}
|
||||
|
||||
sch_tree_lock(sch);
|
||||
|
||||
Reference in New Issue
Block a user