pkt_sched: sch_htb: Remove htb_sched nwc_hit field
authorJarek Poplawski <jarkao2@gmail.com>
Thu, 4 Dec 2008 05:09:10 +0000 (21:09 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 4 Dec 2008 05:09:10 +0000 (21:09 -0800)
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>
net/sched/sch_htb.c

index ce8b1ade8376a5ab2ec70dc6376f0b5c4022e494..7a71e9412e03a164d3dfad3f2cdc76399946a863 100644 (file)
@@ -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;