[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>

1 files changed, 0 insertions, 12 deletions

diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index f3217942ca87..b4662888bdbd 100644
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -286,7 +286,6 @@ config CLS_U32_MARK
 config NET_CLS_RSVP
         tristate "IPv4 Resource Reservation Protocol (RSVP)"
         select NET_CLS
-        select NET_ESTIMATOR
         ---help---
           The Resource Reservation Protocol (RSVP) permits end systems to
           request a minimum and maximum data flow rate for a connection; this
@@ -301,7 +300,6 @@ config NET_CLS_RSVP
 config NET_CLS_RSVP6
         tristate "IPv6 Resource Reservation Protocol (RSVP6)"
         select NET_CLS
-        select NET_ESTIMATOR
         ---help---
           The Resource Reservation Protocol (RSVP) permits end systems to
           request a minimum and maximum data flow rate for a connection; this
@@ -393,7 +391,6 @@ config NET_EMATCH_TEXT
 
 config NET_CLS_ACT
         bool "Actions"
-        select NET_ESTIMATOR
         ---help---
           Say Y here if you want to use traffic control actions. Actions
           get attached to classifiers and are invoked after a successful
@@ -476,7 +473,6 @@ config NET_ACT_SIMP
 config NET_CLS_POLICE
         bool "Traffic Policing (obsolete)"
         depends on NET_CLS_ACT!=y
-        select NET_ESTIMATOR
         ---help---
           Say Y here if you want to do traffic policing, i.e. strict
           bandwidth limiting. This option is obsoleted by the traffic
@@ -491,14 +487,6 @@ config NET_CLS_IND
           classification based on the incoming device. This option is
           likely to disappear in favour of the metadata ematch.
 
-config NET_ESTIMATOR
-        bool "Rate estimator"
-        ---help---
-          Say Y here to allow using rate estimators to estimate the current
-          rate-of-flow for network devices, queues, etc. This module is
-          automatically selected if needed but can be selected manually for
-          statistical purposes.
-
 endif # NET_SCHED
 
 endmenu