Merge tag 'md/3.19' of git://neil.brown.name/md

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

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index aeb6a483b3bc881e4b45c6dad7aacc9ae57bde37..75cc6801a4316dbeb25958192f018b8808681096 100644 (file)
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -33,6 +33,13 @@ config MAC80211_RC_MINSTREL_HT
        ---help---
          This option enables the 'minstrel_ht' TX rate control algorithm
 
+config MAC80211_RC_MINSTREL_VHT
+       bool "Minstrel 802.11ac support" if EXPERT
+       depends on MAC80211_RC_MINSTREL_HT
+       default n
+       ---help---
+         This option enables VHT in the 'minstrel_ht' TX rate control algorithm
+
 choice
        prompt "Default rate control algorithm"
        depends on MAC80211_HAS_RC
@@ -169,6 +176,17 @@ config MAC80211_HT_DEBUG
 
          Do not select this option.
 
+config MAC80211_OCB_DEBUG
+       bool "Verbose OCB debugging"
+       depends on MAC80211_DEBUG_MENU
+       ---help---
+         Selecting this option causes mac80211 to print out
+         very verbose OCB debugging messages. It should not
+         be selected on production systems as those messages
+         are remotely triggerable.
+
+         Do not select this option.
+
 config MAC80211_IBSS_DEBUG
        bool "Verbose IBSS debugging"
        depends on MAC80211_DEBUG_MENU