aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarek Poplawski <jarkao2@gmail.com>2008-12-04 00:09:10 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-04 00:09:10 -0500
commit633fe66ed8385ccf8b4a74a00a4c6eb40850d65f (patch)
treed218b2d533e8c80444d479daad65157881655a32
parent4164d661b8c9602fbbf651a33377d2c51f68c451 (diff)
pkt_sched: sch_htb: Remove htb_sched nwc_hit field
Remove practically unused struct htb_sched nwc_hit field. Signed-off-by: Jarek Poplawski <jarkao2@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sched/sch_htb.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index ce8b1ade8376..7a71e9412e03 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -151,9 +151,6 @@ struct htb_sched {
151 /* time of nearest event per level (row) */ 151 /* time of nearest event per level (row) */
152 psched_time_t near_ev_cache[TC_HTB_MAXDEPTH]; 152 psched_time_t near_ev_cache[TC_HTB_MAXDEPTH];
153 153
154 /* whether we hit non-work conserving class during this dequeue; we use */
155 int nwc_hit; /* this to disable mindelay complaint in dequeue */
156
157 int defcls; /* class where unclassified flows go to */ 154 int defcls; /* class where unclassified flows go to */
158 155
159 /* filters for qdisc itself */ 156 /* filters for qdisc itself */
@@ -807,7 +804,7 @@ next:
807 cl->common.classid); 804 cl->common.classid);
808 cl->warned = 1; 805 cl->warned = 1;
809 } 806 }
810 q->nwc_hit++; 807
811 htb_next_rb_node((level ? cl->parent->un.inner.ptr : q-> 808 htb_next_rb_node((level ? cl->parent->un.inner.ptr : q->
812 ptr[0]) + prio); 809 ptr[0]) + prio);
813 cl = htb_lookup_leaf(q->row[level] + prio, prio, 810 cl = htb_lookup_leaf(q->row[level] + prio, prio,
@@ -852,7 +849,7 @@ static struct sk_buff *htb_dequeue(struct Qdisc *sch)
852 q->now = psched_get_time(); 849 q->now = psched_get_time();
853 850
854 next_event = q->now + 5 * PSCHED_TICKS_PER_SEC; 851 next_event = q->now + 5 * PSCHED_TICKS_PER_SEC;
855 q->nwc_hit = 0; 852
856 for (level = 0; level < TC_HTB_MAXDEPTH; level++) { 853 for (level = 0; level < TC_HTB_MAXDEPTH; level++) {
857 /* common case optimization - skip event handler quickly */ 854 /* common case optimization - skip event handler quickly */
858 int m; 855 int m;