diff options
Diffstat (limited to 'net/sched/sch_cbq.c')
-rw-r--r-- | net/sched/sch_cbq.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index 7a42c81a19eb..2f80d01d42a6 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c | |||
@@ -1058,9 +1058,10 @@ static void cbq_normalize_quanta(struct cbq_sched_data *q, int prio) | |||
1058 | cl->quantum = (cl->weight*cl->allot*q->nclasses[prio])/ | 1058 | cl->quantum = (cl->weight*cl->allot*q->nclasses[prio])/ |
1059 | q->quanta[prio]; | 1059 | q->quanta[prio]; |
1060 | } | 1060 | } |
1061 | if (cl->quantum <= 0 || cl->quantum>32*qdisc_dev(cl->qdisc)->mtu) { | 1061 | if (cl->quantum <= 0 || |
1062 | pr_warning("CBQ: class %08x has bad quantum==%ld, repaired.\n", | 1062 | cl->quantum > 32*qdisc_dev(cl->qdisc)->mtu) { |
1063 | cl->common.classid, cl->quantum); | 1063 | pr_warn("CBQ: class %08x has bad quantum==%ld, repaired.\n", |
1064 | cl->common.classid, cl->quantum); | ||
1064 | cl->quantum = qdisc_dev(cl->qdisc)->mtu/2 + 1; | 1065 | cl->quantum = qdisc_dev(cl->qdisc)->mtu/2 + 1; |
1065 | } | 1066 | } |
1066 | } | 1067 | } |
@@ -1782,8 +1783,7 @@ cbq_change_class(struct Qdisc *sch, u32 classid, u32 parentid, struct nlattr **t | |||
1782 | qdisc_root_sleeping_lock(sch), | 1783 | qdisc_root_sleeping_lock(sch), |
1783 | tca[TCA_RATE]); | 1784 | tca[TCA_RATE]); |
1784 | if (err) { | 1785 | if (err) { |
1785 | if (rtab) | 1786 | qdisc_put_rtab(rtab); |
1786 | qdisc_put_rtab(rtab); | ||
1787 | return err; | 1787 | return err; |
1788 | } | 1788 | } |
1789 | } | 1789 | } |