Commit 633fe66e authored by Jarek Poplawski's avatar Jarek Poplawski Committed by David S. Miller

pkt_sched: sch_htb: Remove htb_sched nwc_hit field

Remove practically unused struct htb_sched nwc_hit field.
Signed-off-by: default avatarJarek Poplawski <jarkao2@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4164d661
...@@ -151,9 +151,6 @@ struct htb_sched { ...@@ -151,9 +151,6 @@ struct htb_sched {
/* time of nearest event per level (row) */ /* time of nearest event per level (row) */
psched_time_t near_ev_cache[TC_HTB_MAXDEPTH]; psched_time_t near_ev_cache[TC_HTB_MAXDEPTH];
/* whether we hit non-work conserving class during this dequeue; we use */
int nwc_hit; /* this to disable mindelay complaint in dequeue */
int defcls; /* class where unclassified flows go to */ int defcls; /* class where unclassified flows go to */
/* filters for qdisc itself */ /* filters for qdisc itself */
...@@ -807,7 +804,7 @@ static struct sk_buff *htb_dequeue_tree(struct htb_sched *q, int prio, ...@@ -807,7 +804,7 @@ static struct sk_buff *htb_dequeue_tree(struct htb_sched *q, int prio,
cl->common.classid); cl->common.classid);
cl->warned = 1; cl->warned = 1;
} }
q->nwc_hit++;
htb_next_rb_node((level ? cl->parent->un.inner.ptr : q-> htb_next_rb_node((level ? cl->parent->un.inner.ptr : q->
ptr[0]) + prio); ptr[0]) + prio);
cl = htb_lookup_leaf(q->row[level] + prio, prio, cl = htb_lookup_leaf(q->row[level] + prio, prio,
...@@ -852,7 +849,7 @@ static struct sk_buff *htb_dequeue(struct Qdisc *sch) ...@@ -852,7 +849,7 @@ static struct sk_buff *htb_dequeue(struct Qdisc *sch)
q->now = psched_get_time(); q->now = psched_get_time();
next_event = q->now + 5 * PSCHED_TICKS_PER_SEC; next_event = q->now + 5 * PSCHED_TICKS_PER_SEC;
q->nwc_hit = 0;
for (level = 0; level < TC_HTB_MAXDEPTH; level++) { for (level = 0; level < TC_HTB_MAXDEPTH; level++) {
/* common case optimization - skip event handler quickly */ /* common case optimization - skip event handler quickly */
int m; int m;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment