Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[deliverable/linux.git] / drivers / net / wireless / intel / iwlwifi / Kconfig

diff --git a/drivers/net/wireless/intel/iwlwifi/Kconfig b/drivers/net/wireless/intel/iwlwifi/Kconfig
index 16c4f383488fcc5160d22dca5980d72bb1a78edd..b64db47b31bbfecf15631dc632c880285b0271ec 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/Kconfig
+++ b/drivers/net/wireless/intel/iwlwifi/Kconfig
@@ -88,16 +88,6 @@ config IWLWIFI_BCAST_FILTERING
          If unsure, don't enable this option, as some programs might
          expect incoming broadcasts for their normal operations.
 
          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.
-

 config IWLWIFI_PCIE_RTPM
        bool "Enable runtime power management mode for PCIe devices"
        depends on IWLMVM && PM
 config IWLWIFI_PCIE_RTPM
        bool "Enable runtime power management mode for PCIe devices"
        depends on IWLMVM && PM


@@ -144,12 +134,6 @@ config IWLWIFI_DEBUGFS
          is a low-impact option that allows getting insight into the
          driver's state at runtime.
 
          is a low-impact option that allows getting insight into the
          driver's state at runtime.
 

-config IWLWIFI_DEBUG_EXPERIMENTAL_UCODE
-        bool "Experimental uCode support"
-        depends on IWLWIFI_DEBUG
-        ---help---
-         Enable use of experimental ucode for testing and debugging.
-

 config IWLWIFI_DEVICE_TRACING
        bool "iwlwifi device access tracing"
        depends on EVENT_TRACING
 config IWLWIFI_DEVICE_TRACING
        bool "iwlwifi device access tracing"
        depends on EVENT_TRACING