From: Jarek Poplawski <jarkao2@gmail.com>
Date: Thu, 4 Dec 2008 05:08:44 +0000 (-0800)
Subject: pkt_sched: sch_htb: Remove htb_class aprio field
X-Git-Tag: v2.6.29-rc1~581^2~333
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4164d661b8c9602fbbf651a33377d2c51f68c451;p=linux-2.6-omap-h63xx.git

pkt_sched: sch_htb: Remove htb_class aprio field

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>
---

diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 8a451998973..ce8b1ade837 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -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);
 	}
 }