diff options
Diffstat (limited to 'net/mac80211/Kconfig')
-rw-r--r-- | net/mac80211/Kconfig | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig index cac6cf2e9ac8..09c255002e56 100644 --- a/net/mac80211/Kconfig +++ b/net/mac80211/Kconfig | |||
@@ -13,25 +13,17 @@ config MAC80211 | |||
13 | This option enables the hardware independent IEEE 802.11 | 13 | This option enables the hardware independent IEEE 802.11 |
14 | networking stack. | 14 | networking stack. |
15 | 15 | ||
16 | config MAC80211_RC_DEFAULT_CHOICE | 16 | menu "Rate control algorithm selection" |
17 | bool "Choose default rate control algorithm" if EMBEDDED | 17 | depends on MAC80211 != n |
18 | default y | ||
19 | depends on MAC80211 | ||
20 | ---help--- | ||
21 | This options enables selection of a default rate control | ||
22 | algorithm to be built into the mac80211 module. Alternate | ||
23 | rate control algorithms might be built into the mac80211 | ||
24 | module as well. | ||
25 | 18 | ||
26 | choice | 19 | choice |
27 | prompt "Default rate control algorithm" | 20 | prompt "Default rate control algorithm" |
28 | default MAC80211_RC_DEFAULT_PID | 21 | default MAC80211_RC_DEFAULT_PID |
29 | depends on MAC80211 && MAC80211_RC_DEFAULT_CHOICE | ||
30 | ---help--- | 22 | ---help--- |
31 | This option selects the default rate control algorithm | 23 | This option selects the default rate control algorithm |
32 | mac80211 will use. Note that this default can still be | 24 | mac80211 will use. Note that this default can still be |
33 | overriden through the ieee80211_default_rc_algo module | 25 | overriden through the ieee80211_default_rc_algo module |
34 | parameter. | 26 | parameter if different algorithms are available. |
35 | 27 | ||
36 | config MAC80211_RC_DEFAULT_PID | 28 | config MAC80211_RC_DEFAULT_PID |
37 | bool "PID controller based rate control algorithm" | 29 | bool "PID controller based rate control algorithm" |
@@ -50,19 +42,27 @@ config MAC80211_RC_DEFAULT_SIMPLE | |||
50 | dumb algorithm. You should choose the PID rate control | 42 | dumb algorithm. You should choose the PID rate control |
51 | instead. | 43 | instead. |
52 | 44 | ||
45 | config MAC80211_RC_DEFAULT_NONE | ||
46 | bool "No default algorithm" | ||
47 | depends on EMBEDDED | ||
48 | help | ||
49 | Selecting this option will select no default algorithm | ||
50 | and allow you to not build any. Do not choose this | ||
51 | option unless you know your driver comes with another | ||
52 | suitable algorithm. | ||
53 | endchoice | 53 | endchoice |
54 | 54 | ||
55 | comment "Selecting 'y' for an algorithm will" | ||
56 | comment "build the algorithm into mac80211." | ||
57 | |||
55 | config MAC80211_RC_DEFAULT | 58 | config MAC80211_RC_DEFAULT |
56 | string | 59 | string |
57 | depends on MAC80211 | ||
58 | default "pid" if MAC80211_RC_DEFAULT_PID | 60 | default "pid" if MAC80211_RC_DEFAULT_PID |
59 | default "simple" if MAC80211_RC_DEFAULT_SIMPLE | 61 | default "simple" if MAC80211_RC_DEFAULT_SIMPLE |
60 | default "" | 62 | default "" |
61 | 63 | ||
62 | config MAC80211_RC_PID | 64 | config MAC80211_RC_PID |
63 | bool "PID controller based rate control algorithm" | 65 | tristate "PID controller based rate control algorithm" |
64 | default y | ||
65 | depends on MAC80211 | ||
66 | ---help--- | 66 | ---help--- |
67 | This option enables a TX rate control algorithm for | 67 | This option enables a TX rate control algorithm for |
68 | mac80211 that uses a PID controller to select the TX | 68 | mac80211 that uses a PID controller to select the TX |
@@ -72,16 +72,15 @@ config MAC80211_RC_PID | |||
72 | different rate control algorithm. | 72 | different rate control algorithm. |
73 | 73 | ||
74 | config MAC80211_RC_SIMPLE | 74 | config MAC80211_RC_SIMPLE |
75 | bool "Simple rate control algorithm (DEPRECATED)" | 75 | tristate "Simple rate control algorithm (DEPRECATED)" |
76 | default n | ||
77 | depends on MAC80211 | ||
78 | ---help--- | 76 | ---help--- |
79 | This option enables a very simple, non-responsive TX | 77 | This option enables a very simple, non-responsive TX |
80 | rate control algorithm. This algorithm is deprecated | 78 | rate control algorithm. This algorithm is deprecated |
81 | and will be removed from the kernel in near future. | 79 | and will be removed from the kernel in the near future. |
82 | It has been replaced by the PID algorithm. | 80 | It has been replaced by the PID algorithm. |
83 | 81 | ||
84 | Say N unless you know what you are doing. | 82 | Say N unless you know what you are doing. |
83 | endmenu | ||
85 | 84 | ||
86 | config MAC80211_LEDS | 85 | config MAC80211_LEDS |
87 | bool "Enable LED triggers" | 86 | bool "Enable LED triggers" |