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>

diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index e251833..2f80d01 100644 (file)
--- 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)
                        }
                        if (cl->quantum <= 0 ||
                            cl->quantum > 32*qdisc_dev(cl->qdisc)->mtu) {
-                               pr_warning("CBQ: class %08x has bad quantum==%ld, repaired.\n",
-                                          cl->common.classid, cl->quantum);
+                               pr_warn("CBQ: class %08x has bad quantum==%ld, repaired.\n",
+                                       cl->common.classid, cl->quantum);
                                cl->quantum = qdisc_dev(cl->qdisc)->mtu/2 + 1;
                        }
                }

diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c
index 0952fd2..7cd49e5 100644 (file)
--- 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)
                 * and don't need yet another qdisc as a bypass.
                 */
                if (p->mask[index] != 0xff || p->value[index])
-                       pr_warning("dsmark_dequeue: unsupported protocol %d\n",
-                                  ntohs(skb->protocol));
+                       pr_warn("dsmark_dequeue: unsupported protocol %d\n",
+                               ntohs(skb->protocol));
                break;
        }
 

diff --cc net/sched/sch_gred.c
Simple merge

diff --cc net/sched/sch_htb.c
Simple merge