diff options
-rw-r--r-- | drivers/net/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 9cb3ca5806fc..6e863aa9894c 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -2833,7 +2833,7 @@ config NET_FC | |||
2833 | "SCSI generic support". | 2833 | "SCSI generic support". |
2834 | 2834 | ||
2835 | config SHAPER | 2835 | config SHAPER |
2836 | tristate "Traffic Shaper (EXPERIMENTAL)" | 2836 | tristate "Traffic Shaper (OBSOLETE)" |
2837 | depends on EXPERIMENTAL | 2837 | depends on EXPERIMENTAL |
2838 | ---help--- | 2838 | ---help--- |
2839 | The traffic shaper is a virtual network device that allows you to | 2839 | The traffic shaper is a virtual network device that allows you to |
@@ -2842,9 +2842,9 @@ config SHAPER | |||
2842 | these virtual devices. See | 2842 | these virtual devices. See |
2843 | <file:Documentation/networking/shaper.txt> for more information. | 2843 | <file:Documentation/networking/shaper.txt> for more information. |
2844 | 2844 | ||
2845 | An alternative to this traffic shaper is the experimental | 2845 | An alternative to this traffic shaper are traffic schedulers which |
2846 | Class-Based Queuing (CBQ) scheduling support which you get if you | 2846 | you'll get if you say Y to "QoS and/or fair queuing" in |
2847 | say Y to "QoS and/or fair queuing" above. | 2847 | "Networking options". |
2848 | 2848 | ||
2849 | To compile this driver as a module, choose M here: the module | 2849 | To compile this driver as a module, choose M here: the module |
2850 | will be called shaper. If unsure, say N. | 2850 | will be called shaper. If unsure, say N. |