net_sched/hfsc: opencode trivial set_active() and set_passive()

Any move comment abount update_vf() into right place.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
index 14c99870cdb60e1f34c87b3dfeae19f59b2fba34..15f09cb9f1ffccc2dca8fb6b12f21a3ac5bd6f24 100644 (file)
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@ -829,28 +829,6 @@ update_vf(struct hfsc_class *cl, unsigned int len, u64 cur_time)
        }
 }
 
-static void
-set_active(struct hfsc_class *cl, unsigned int len)
-{
-       if (cl->cl_flags & HFSC_RSC)
-               init_ed(cl, len);
-       if (cl->cl_flags & HFSC_FSC)
-               init_vf(cl, len);
-
-}
-
-static void
-set_passive(struct hfsc_class *cl)
-{
-       if (cl->cl_flags & HFSC_RSC)
-               eltree_remove(cl);
-
-       /*
-        * vttree is now handled in update_vf() so that update_vf(cl, 0, 0)
-        * needs to be called explicitly to remove a class from vttree.
-        */
-}
-
 static unsigned int
 qdisc_peek_len(struct Qdisc *sch)
 {
@@ -1221,8 +1199,12 @@ hfsc_qlen_notify(struct Qdisc *sch, unsigned long arg)
 {
        struct hfsc_class *cl = (struct hfsc_class *)arg;
 
+       /* vttree is now handled in update_vf() so that update_vf(cl, 0, 0)
+        * needs to be called explicitly to remove a class from vttree.
+        */
        update_vf(cl, 0, 0);
-       set_passive(cl);
+       if (cl->cl_flags & HFSC_RSC)
+               eltree_remove(cl);
 }
 
 static unsigned long
@@ -1583,7 +1565,12 @@ hfsc_enqueue(struct sk_buff *skb, struct Qdisc *sch, struct sk_buff **to_free)
        }
 
        if (cl->qdisc->q.qlen == 1) {
-               set_active(cl, qdisc_pkt_len(skb));
+               unsigned int len = qdisc_pkt_len(skb);
+
+               if (cl->cl_flags & HFSC_RSC)
+                       init_ed(cl, len);
+               if (cl->cl_flags & HFSC_FSC)
+                       init_vf(cl, len);
                /*
                 * If this is the first packet, isolate the head so an eventual
                 * head drop before the first dequeue operation has no chance
@@ -1647,18 +1634,18 @@ hfsc_dequeue(struct Qdisc *sch)
        if (realtime)
                cl->cl_cumul += qdisc_pkt_len(skb);
 
-       if (cl->qdisc->q.qlen != 0) {
-               if (cl->cl_flags & HFSC_RSC) {
+       if (cl->cl_flags & HFSC_RSC) {
+               if (cl->qdisc->q.qlen != 0) {
                        /* update ed */
                        next_len = qdisc_peek_len(cl->qdisc);
                        if (realtime)
                                update_ed(cl, next_len);
                        else
                                update_d(cl, next_len);
+               } else {
+                       /* the class becomes passive */
+                       eltree_remove(cl);
                }
-       } else {
-               /* the class becomes passive */
-               set_passive(cl);
        }
 
        qdisc_bstats_update(sch, skb);