Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[firefly-linux-kernel-4.4.55.git] / net / sched / sch_htb.c

diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 717b2108f852b52399270a5be516441d9c79ed83..722e137df244dfef1fbd1ab8e8b477546990acde 100644 (file)
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -219,11 +219,16 @@ static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch,
        if (skb->priority == sch->handle)
                return HTB_DIRECT;      /* X:0 (direct flow) selected */
        cl = htb_find(skb->priority, sch);
-       if (cl && cl->level == 0)
-               return cl;
+       if (cl) {
+               if (cl->level == 0)
+                       return cl;
+               /* Start with inner filter chain if a non-leaf class is selected */
+               tcf = cl->filter_list;
+       } else {
+               tcf = q->filter_list;
+       }
 
        *qerr = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
-       tcf = q->filter_list;
        while (tcf && (result = tc_classify(skb, tcf, &res)) >= 0) {
 #ifdef CONFIG_NET_CLS_ACT
                switch (result) {
@@ -712,7 +717,7 @@ static s64 htb_do_events(struct htb_sched *q, const int level,
 
        /* too much load - let's continue after a break for scheduling */
        if (!(q->warned & HTB_WARN_TOOMANYEVENTS)) {
-               pr_warning("htb: too many events!\n");
+               pr_warn("htb: too many events!\n");
                q->warned |= HTB_WARN_TOOMANYEVENTS;
        }
 
@@ -1276,9 +1281,10 @@ static int htb_delete(struct Qdisc *sch, unsigned long arg)
        struct Qdisc *new_q = NULL;
        int last_child = 0;
 
-       // TODO: why don't allow to delete subtree ? references ? does
-       // tc subsys quarantee us that in htb_destroy it holds no class
-       // refs so that we can remove children safely there ?
+       /* TODO: why don't allow to delete subtree ? references ? does
+        * tc subsys guarantee us that in htb_destroy it holds no class
+        * refs so that we can remove children safely there ?
+        */
        if (cl->children || cl->filter_cnt)
                return -EBUSY;
 
@@ -1337,7 +1343,6 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
        struct htb_sched *q = qdisc_priv(sch);
        struct htb_class *cl = (struct htb_class *)*arg, *parent;
        struct nlattr *opt = tca[TCA_OPTIONS];
-       struct qdisc_rate_table *rtab = NULL, *ctab = NULL;
        struct nlattr *tb[TCA_HTB_MAX + 1];
        struct tc_htb_opt *hopt;
        u64 rate64, ceil64;
@@ -1361,16 +1366,11 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
                goto failure;
 
        /* Keeping backward compatible with rate_table based iproute2 tc */
-       if (hopt->rate.linklayer == TC_LINKLAYER_UNAWARE) {
-               rtab = qdisc_get_rtab(&hopt->rate, tb[TCA_HTB_RTAB]);
-               if (rtab)
-                       qdisc_put_rtab(rtab);
-       }
-       if (hopt->ceil.linklayer == TC_LINKLAYER_UNAWARE) {
-               ctab = qdisc_get_rtab(&hopt->ceil, tb[TCA_HTB_CTAB]);
-               if (ctab)
-                       qdisc_put_rtab(ctab);
-       }
+       if (hopt->rate.linklayer == TC_LINKLAYER_UNAWARE)
+               qdisc_put_rtab(qdisc_get_rtab(&hopt->rate, tb[TCA_HTB_RTAB]));
+
+       if (hopt->ceil.linklayer == TC_LINKLAYER_UNAWARE)
+               qdisc_put_rtab(qdisc_get_rtab(&hopt->ceil, tb[TCA_HTB_CTAB]));
 
        if (!cl) {              /* new class */
                struct Qdisc *new_q;
@@ -1494,15 +1494,13 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
                cl->quantum = min_t(u64, quantum, INT_MAX);
 
                if (!hopt->quantum && cl->quantum < 1000) {
-                       pr_warning(
-                              "HTB: quantum of class %X is small. Consider r2q change.\n",
-                              cl->common.classid);
+                       pr_warn("HTB: quantum of class %X is small. Consider r2q change.\n",
+                               cl->common.classid);
                        cl->quantum = 1000;
                }
                if (!hopt->quantum && cl->quantum > 200000) {
-                       pr_warning(
-                              "HTB: quantum of class %X is big. Consider r2q change.\n",
-                              cl->common.classid);
+                       pr_warn("HTB: quantum of class %X is big. Consider r2q change.\n",
+                               cl->common.classid);
                        cl->quantum = 200000;
                }
                if (hopt->quantum)