diff options
author | Yang Yingliang <yangyingliang@huawei.com> | 2013-12-23 04:38:58 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-12-31 13:50:56 -0500 |
commit | c17988a90f92c61164d6b82dd92ce8ade03899c2 (patch) | |
tree | df7391e252946c69ef3c5cda540ae9bc71aa02c8 /net/sched | |
parent | d4dd8aeefda96225abbb6ab21c80bb1cd9b684db (diff) |
net_sched: replace pr_warning with pr_warn
Prefer pr_warn(... to pr_warning(...
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r-- | net/sched/sch_cbq.c | 4 | ||||
-rw-r--r-- | net/sched/sch_dsmark.c | 4 | ||||
-rw-r--r-- | net/sched/sch_gred.c | 4 | ||||
-rw-r--r-- | net/sched/sch_htb.c | 12 |
4 files changed, 11 insertions, 13 deletions
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index e25183333807..2f80d01d42a6 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c | |||
@@ -1060,8 +1060,8 @@ static void cbq_normalize_quanta(struct cbq_sched_data *q, int prio) | |||
1060 | } | 1060 | } |
1061 | if (cl->quantum <= 0 || | 1061 | if (cl->quantum <= 0 || |
1062 | cl->quantum > 32*qdisc_dev(cl->qdisc)->mtu) { | 1062 | cl->quantum > 32*qdisc_dev(cl->qdisc)->mtu) { |
1063 | pr_warning("CBQ: class %08x has bad quantum==%ld, repaired.\n", | 1063 | pr_warn("CBQ: class %08x has bad quantum==%ld, repaired.\n", |
1064 | cl->common.classid, cl->quantum); | 1064 | cl->common.classid, cl->quantum); |
1065 | cl->quantum = qdisc_dev(cl->qdisc)->mtu/2 + 1; | 1065 | cl->quantum = qdisc_dev(cl->qdisc)->mtu/2 + 1; |
1066 | } | 1066 | } |
1067 | } | 1067 | } |
diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c index 0952fd2684e4..7cd49e5f2dfe 100644 --- a/net/sched/sch_dsmark.c +++ b/net/sched/sch_dsmark.c | |||
@@ -303,8 +303,8 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch) | |||
303 | * and don't need yet another qdisc as a bypass. | 303 | * and don't need yet another qdisc as a bypass. |
304 | */ | 304 | */ |
305 | if (p->mask[index] != 0xff || p->value[index]) | 305 | if (p->mask[index] != 0xff || p->value[index]) |
306 | pr_warning("dsmark_dequeue: unsupported protocol %d\n", | 306 | pr_warn("dsmark_dequeue: unsupported protocol %d\n", |
307 | ntohs(skb->protocol)); | 307 | ntohs(skb->protocol)); |
308 | break; | 308 | break; |
309 | } | 309 | } |
310 | 310 | ||
diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c index d42234c0f13b..12cbc09157fc 100644 --- a/net/sched/sch_gred.c +++ b/net/sched/sch_gred.c | |||
@@ -370,8 +370,8 @@ static inline int gred_change_table_def(struct Qdisc *sch, struct nlattr *dps) | |||
370 | 370 | ||
371 | for (i = table->DPs; i < MAX_DPs; i++) { | 371 | for (i = table->DPs; i < MAX_DPs; i++) { |
372 | if (table->tab[i]) { | 372 | if (table->tab[i]) { |
373 | pr_warning("GRED: Warning: Destroying " | 373 | pr_warn("GRED: Warning: Destroying shadowed VQ 0x%x\n", |
374 | "shadowed VQ 0x%x\n", i); | 374 | i); |
375 | gred_destroy_vq(table->tab[i]); | 375 | gred_destroy_vq(table->tab[i]); |
376 | table->tab[i] = NULL; | 376 | table->tab[i] = NULL; |
377 | } | 377 | } |
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) |