]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
pkt_sched: sch_htb: Remove htb_class aprio field
authorJarek Poplawski <jarkao2@gmail.com>
Thu, 4 Dec 2008 05:08:44 +0000 (21:08 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 4 Dec 2008 05:08:44 +0000 (21:08 -0800)
Remove practically unused struct htb_class aprio field.

Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/sch_htb.c

index 8a4519989732b392caca4640e5440fe9340c47ca..ce8b1ade8376a5ab2ec70dc6376f0b5c4022e494 100644 (file)
@@ -88,7 +88,6 @@ struct htb_class {
                struct htb_class_leaf {
                        struct Qdisc *q;
                        int prio;
-                       int aprio;
                        int quantum;
                        int deficit[TC_HTB_MAXDEPTH];
                        struct list_head drop_list;
@@ -527,10 +526,10 @@ static inline void htb_activate(struct htb_sched *q, struct htb_class *cl)
        WARN_ON(cl->level || !cl->un.leaf.q || !cl->un.leaf.q->q.qlen);
 
        if (!cl->prio_activity) {
-               cl->prio_activity = 1 << (cl->un.leaf.aprio = cl->un.leaf.prio);
+               cl->prio_activity = 1 << cl->un.leaf.prio;
                htb_activate_prios(q, cl);
                list_add_tail(&cl->un.leaf.drop_list,
-                             q->drops + cl->un.leaf.aprio);
+                             q->drops + cl->un.leaf.prio);
        }
 }