Merge branch 'for-3.17/core' of git://git.kernel.dk/linux-block

[cascardo/linux.git] / net / mac80211 / Kconfig

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 97b5dca..aeb6a48 100644 (file)
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -19,14 +19,6 @@ if MAC80211 != n
 config MAC80211_HAS_RC
        bool
 
-config MAC80211_RC_PID
-       bool "PID controller based rate control algorithm" if EXPERT
-       select MAC80211_HAS_RC
-       ---help---
-         This option enables a TX rate control algorithm for
-         mac80211 that uses a PID controller to select the TX
-         rate.
-
 config MAC80211_RC_MINSTREL
        bool "Minstrel" if EXPERT
        select MAC80211_HAS_RC
@@ -51,14 +43,6 @@ choice
          overridden through the ieee80211_default_rc_algo module
          parameter if different algorithms are available.
 
-config MAC80211_RC_DEFAULT_PID
-       bool "PID controller based rate control algorithm"
-       depends on MAC80211_RC_PID
-       ---help---
-         Select the PID controller based rate control as the
-         default rate control algorithm. You should choose
-         this unless you know what you are doing.
-
 config MAC80211_RC_DEFAULT_MINSTREL
        bool "Minstrel"
        depends on MAC80211_RC_MINSTREL
@@ -72,7 +56,6 @@ config MAC80211_RC_DEFAULT
        string
        default "minstrel_ht" if MAC80211_RC_DEFAULT_MINSTREL && MAC80211_RC_MINSTREL_HT
        default "minstrel" if MAC80211_RC_DEFAULT_MINSTREL
-       default "pid" if MAC80211_RC_DEFAULT_PID
        default ""
 
 endif