[NET]: Unlink qdiscs in qdisc_destroy even when CONFIG_NET_SCHED is not enabled.

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 71cc4f3414afc19168c7333e819d2832cf91cd7e..ff7c6877a402aff573159719acc239deae97db41 100644 (file)
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -416,7 +416,6 @@ void qdisc_destroy(struct Qdisc *qdisc)
 
        dev = qdisc->dev;
 
-#ifdef CONFIG_NET_SCHED
        if (dev) {
                struct Qdisc *q, **qp;
                for (qp = &qdisc->dev->qdisc_list; (q=*qp) != NULL; qp = &q->next) {
@@ -428,7 +427,6 @@ void qdisc_destroy(struct Qdisc *qdisc)
        }
 #ifdef CONFIG_NET_ESTIMATOR
        qdisc_kill_estimator(&qdisc->stats);
-#endif
 #endif
        if (ops->reset)
                ops->reset(qdisc);