[PKT_SCHED]: HTB: Remove unneeded rate estimator bits

Removes old generic unused rate estimator bits. HTB has its own
rate estimator routines and therefore no rate estimator is created
so there is no need to try and delete one. We might want to convert
it to the generic rate estimator at a later point.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index a88bc81fcb25d95c554086f8db6ec26deb8a35a5..2de5a8a0148185a1aaf47007d0c50b30f5873eab 100644 (file)
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -145,7 +145,6 @@ struct htb_class
     struct gnet_stats_basic bstats;
     struct gnet_stats_queue qstats;
     struct gnet_stats_rate_est rate_est;
-    spinlock_t         *stats_lock;
     struct tc_htb_xstats xstats;/* our special stats */
     int refcnt;                        /* usage count of this class */
 
@@ -1468,9 +1467,6 @@ static void htb_destroy_class(struct Qdisc* sch,struct htb_class *cl)
        qdisc_put_rtab(cl->rate);
        qdisc_put_rtab(cl->ceil);
        
-#ifdef CONFIG_NET_ESTIMATOR
-       qdisc_kill_estimator(&cl->stats);
-#endif
        htb_destroy_filters (&cl->filter_list);
        
        while (!list_empty(&cl->children))