From c9710e0cedcf1ccc2d7c5a4f125f8cb9c47f2f11 Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Wed, 3 Dec 2008 21:08:44 -0800
Subject: [PATCH] --- yaml --- r: 122437 b: refs/heads/master c:
 4164d661b8c9602fbbf651a33377d2c51f68c451 h: refs/heads/master i:   122435:
 437862d52c05689454bb3e87c57b00746e0cf1bf v: v3

---
 [refs]                    | 2 +-
 trunk/net/sched/sch_htb.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 77762c6088d3..63f2d3a4a712 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb52deba12f27af90a46d2f8667a64888118a888
+refs/heads/master: 4164d661b8c9602fbbf651a33377d2c51f68c451
diff --git a/trunk/net/sched/sch_htb.c b/trunk/net/sched/sch_htb.c
index 8a4519989732..ce8b1ade8376 100644
--- a/trunk/net/sched/sch_htb.c
+++ b/trunk/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);
 	}
 }