diff options
author | Patrick McHardy <kaber@trash.net> | 2007-07-03 01:46:07 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-11 01:16:37 -0400 |
commit | 876d48aabf30e4981653f1a0a7ae1e262b8c8b6f (patch) | |
tree | 49dace46f70bc243605ecf73af4a3f06e607a2be /net/sched/sch_generic.c | |
parent | a553e4a6317b2cfc7659542c10fe43184ffe53da (diff) |
[NET_SCHED]: Remove CONFIG_NET_ESTIMATOR option
The generic estimator is always built in anways and all the config options
does is prevent including a minimal amount of code for setting it up.
Additionally the option is already automatically selected for most cases.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_generic.c')
-rw-r--r-- | net/sched/sch_generic.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 2488dbb17b60..e525fd723c12 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c | |||
@@ -514,9 +514,7 @@ void qdisc_destroy(struct Qdisc *qdisc) | |||
514 | return; | 514 | return; |
515 | 515 | ||
516 | list_del(&qdisc->list); | 516 | list_del(&qdisc->list); |
517 | #ifdef CONFIG_NET_ESTIMATOR | ||
518 | gen_kill_estimator(&qdisc->bstats, &qdisc->rate_est); | 517 | gen_kill_estimator(&qdisc->bstats, &qdisc->rate_est); |
519 | #endif | ||
520 | if (ops->reset) | 518 | if (ops->reset) |
521 | ops->reset(qdisc); | 519 | ops->reset(qdisc); |
522 | if (ops->destroy) | 520 | if (ops->destroy) |