Merge remote-tracking branch 'iwlwifi-fixes/master' into NEXT

[linux-2.6-block.git] / drivers / net / wireless / iwlwifi / Kconfig

diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index 824f5e2877835d8a829f643d8b15cf1ed85e2572..267e48a2915e7885993979337619d777c8cb74c8 100644 (file)
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -85,6 +85,16 @@ config IWLWIFI_BCAST_FILTERING
          If unsure, don't enable this option, as some programs might
          expect incoming broadcasts for their normal operations.
 
+config IWLWIFI_UAPSD
+       bool "enable U-APSD by default"
+       depends on IWLMVM
+       help
+         Say Y here to enable U-APSD by default. This may cause
+         interoperability problems with some APs, manifesting in lower than
+         expected throughput due to those APs not enabling aggregation
+
+         If unsure, say N.
+
 menu "Debugging Options"
 
 config IWLWIFI_DEBUG