diff options
Diffstat (limited to 'net/sched/Kconfig')
-rw-r--r-- | net/sched/Kconfig | 12 |
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 | |||
286 | config NET_CLS_RSVP | 286 | config NET_CLS_RSVP |
287 | tristate "IPv4 Resource Reservation Protocol (RSVP)" | 287 | tristate "IPv4 Resource Reservation Protocol (RSVP)" |
288 | select NET_CLS | 288 | select NET_CLS |
289 | select NET_ESTIMATOR | ||
290 | ---help--- | 289 | ---help--- |
291 | The Resource Reservation Protocol (RSVP) permits end systems to | 290 | The Resource Reservation Protocol (RSVP) permits end systems to |
292 | request a minimum and maximum data flow rate for a connection; this | 291 | request a minimum and maximum data flow rate for a connection; this |
@@ -301,7 +300,6 @@ config NET_CLS_RSVP | |||
301 | config NET_CLS_RSVP6 | 300 | config NET_CLS_RSVP6 |
302 | tristate "IPv6 Resource Reservation Protocol (RSVP6)" | 301 | tristate "IPv6 Resource Reservation Protocol (RSVP6)" |
303 | select NET_CLS | 302 | select NET_CLS |
304 | select NET_ESTIMATOR | ||
305 | ---help--- | 303 | ---help--- |
306 | The Resource Reservation Protocol (RSVP) permits end systems to | 304 | The Resource Reservation Protocol (RSVP) permits end systems to |
307 | request a minimum and maximum data flow rate for a connection; this | 305 | request a minimum and maximum data flow rate for a connection; this |
@@ -393,7 +391,6 @@ config NET_EMATCH_TEXT | |||
393 | 391 | ||
394 | config NET_CLS_ACT | 392 | config NET_CLS_ACT |
395 | bool "Actions" | 393 | bool "Actions" |
396 | select NET_ESTIMATOR | ||
397 | ---help--- | 394 | ---help--- |
398 | Say Y here if you want to use traffic control actions. Actions | 395 | Say Y here if you want to use traffic control actions. Actions |
399 | get attached to classifiers and are invoked after a successful | 396 | get attached to classifiers and are invoked after a successful |
@@ -476,7 +473,6 @@ config NET_ACT_SIMP | |||
476 | config NET_CLS_POLICE | 473 | config NET_CLS_POLICE |
477 | bool "Traffic Policing (obsolete)" | 474 | bool "Traffic Policing (obsolete)" |
478 | depends on NET_CLS_ACT!=y | 475 | depends on NET_CLS_ACT!=y |
479 | select NET_ESTIMATOR | ||
480 | ---help--- | 476 | ---help--- |
481 | Say Y here if you want to do traffic policing, i.e. strict | 477 | Say Y here if you want to do traffic policing, i.e. strict |
482 | bandwidth limiting. This option is obsoleted by the traffic | 478 | bandwidth limiting. This option is obsoleted by the traffic |
@@ -491,14 +487,6 @@ config NET_CLS_IND | |||
491 | classification based on the incoming device. This option is | 487 | classification based on the incoming device. This option is |
492 | likely to disappear in favour of the metadata ematch. | 488 | likely to disappear in favour of the metadata ematch. |
493 | 489 | ||
494 | config NET_ESTIMATOR | ||
495 | bool "Rate estimator" | ||
496 | ---help--- | ||
497 | Say Y here to allow using rate estimators to estimate the current | ||
498 | rate-of-flow for network devices, queues, etc. This module is | ||
499 | automatically selected if needed but can be selected manually for | ||
500 | statistical purposes. | ||
501 | |||
502 | endif # NET_SCHED | 490 | endif # NET_SCHED |
503 | 491 | ||
504 | endmenu | 492 | endmenu |