diff options
Diffstat (limited to 'net/sched/sch_htb.c')
-rw-r--r-- | net/sched/sch_htb.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 6b0e854b0115..e5988101e1fd 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c | |||
@@ -712,7 +712,7 @@ static s64 htb_do_events(struct htb_sched *q, const int level, | |||
712 | 712 | ||
713 | /* too much load - let's continue after a break for scheduling */ | 713 | /* too much load - let's continue after a break for scheduling */ |
714 | if (!(q->warned & HTB_WARN_TOOMANYEVENTS)) { | 714 | if (!(q->warned & HTB_WARN_TOOMANYEVENTS)) { |
715 | pr_warning("htb: too many events!\n"); | 715 | pr_warn("htb: too many events!\n"); |
716 | q->warned |= HTB_WARN_TOOMANYEVENTS; | 716 | q->warned |= HTB_WARN_TOOMANYEVENTS; |
717 | } | 717 | } |
718 | 718 | ||
@@ -1488,15 +1488,13 @@ static int htb_change_class(struct Qdisc *sch, u32 classid, | |||
1488 | cl->quantum = min_t(u64, quantum, INT_MAX); | 1488 | cl->quantum = min_t(u64, quantum, INT_MAX); |
1489 | 1489 | ||
1490 | if (!hopt->quantum && cl->quantum < 1000) { | 1490 | if (!hopt->quantum && cl->quantum < 1000) { |
1491 | pr_warning( | 1491 | pr_warn("HTB: quantum of class %X is small. Consider r2q change.\n", |
1492 | "HTB: quantum of class %X is small. Consider r2q change.\n", | 1492 | cl->common.classid); |
1493 | cl->common.classid); | ||
1494 | cl->quantum = 1000; | 1493 | cl->quantum = 1000; |
1495 | } | 1494 | } |
1496 | if (!hopt->quantum && cl->quantum > 200000) { | 1495 | if (!hopt->quantum && cl->quantum > 200000) { |
1497 | pr_warning( | 1496 | pr_warn("HTB: quantum of class %X is big. Consider r2q change.\n", |
1498 | "HTB: quantum of class %X is big. Consider r2q change.\n", | 1497 | cl->common.classid); |
1499 | cl->common.classid); | ||
1500 | cl->quantum = 200000; | 1498 | cl->quantum = 200000; |
1501 | } | 1499 | } |
1502 | if (hopt->quantum) | 1500 | if (hopt->quantum) |