pkt_sched: sch_htb: Remove htb_sched nwc_hit field
Subsystems (3)
PATCH 2/3 pkt_sched: sch_htb: Remove htb_sched nwc_hit field
Remove practically unused struct htb_sched nwc_hit field.
Signed-off-by Jarek Poplawski <[email protected]>
--- net/sched/sch_htb.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
net/sched/sch_htb.c +2 -5
@@ -151,9 +151,6 @@ struct htb_sched {/* time of nearest event per level (row) */ 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 */ /* filters for qdisc itself */
@@ -807,7 +804,7 @@ next: cl->common.classid); cl->warned =1 ; } - q->nwc_hit++; +htb_next_rb_node ((level ? cl->parent->un.inner.ptr : q-> ptr[0 ]) + prio); cl = htb_lookup_leaf(q->row[level] + prio, prio,
@@ -852,7 +849,7 @@ static struct sk_buff *htb_dequeue(struct Qdisc *sch) q->now =psched_get_time (); next_event = q->now +5 *PSCHED_TICKS_PER_SEC ; - q->nwc_hit =0 ; +for (level =0 ; level <TC_HTB_MAXDEPTH ; level++) {/* common case optimization - skip event handler quickly */ int m;
Signature · 1 line
1.5.6.5
From: Jarek Poplawski <[email protected]>
Date: Tue, 2 Dec 2008 08:56:36 +0000
Quoted 3 lines
Remove practically unused struct
htb_schednwc_hitfield.Signed-off-by Jarek Poplawski <[email protected]>
Applied.