Patchwork [1/3] pkt_sched: sch_htb: Remove htb_class aprio field

login
register
mail settings
Submitter Jarek Poplawski
Date Dec. 2, 2008, 8:56 a.m.
Message ID <20081202085622.GA10412@ff.dom.local>
Download mbox | patch
Permalink /patch/11743/
State Accepted
Delegated to: David Miller
Headers show

Comments

Jarek Poplawski - Dec. 2, 2008, 8:56 a.m.
Remove practically unused struct htb_class aprio field.

Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
---
 net/sched/sch_htb.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
David Miller - Dec. 4, 2008, 5:08 a.m.
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Tue, 2 Dec 2008 08:56:22 +0000

> Remove practically unused struct htb_class aprio field.
> 
> Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 8a45199..ce8b1ad 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);
 	}
 }