Commit 633fe66ed8385ccf8b4a74a00a4c6eb40850d65f
Committed by
David S. Miller
1 parent
4164d661b8
Exists in
master
and in
7 other branches
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>
Showing 1 changed file with 2 additions and 5 deletions Side-by-side Diff
net/sched/sch_htb.c
... | ... | @@ -151,9 +151,6 @@ |
151 | 151 | /* time of nearest event per level (row) */ |
152 | 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 | 154 | int defcls; /* class where unclassified flows go to */ |
158 | 155 | |
159 | 156 | /* filters for qdisc itself */ |
... | ... | @@ -807,7 +804,7 @@ |
807 | 804 | cl->common.classid); |
808 | 805 | cl->warned = 1; |
809 | 806 | } |
810 | - q->nwc_hit++; | |
807 | + | |
811 | 808 | htb_next_rb_node((level ? cl->parent->un.inner.ptr : q-> |
812 | 809 | ptr[0]) + prio); |
813 | 810 | cl = htb_lookup_leaf(q->row[level] + prio, prio, |
... | ... | @@ -852,7 +849,7 @@ |
852 | 849 | q->now = psched_get_time(); |
853 | 850 | |
854 | 851 | next_event = q->now + 5 * PSCHED_TICKS_PER_SEC; |
855 | - q->nwc_hit = 0; | |
852 | + | |
856 | 853 | for (level = 0; level < TC_HTB_MAXDEPTH; level++) { |
857 | 854 | /* common case optimization - skip event handler quickly */ |
858 | 855 | int m; |