iwlwifi: remove IWLWIFI_UAPSD Kconfig

We have a module parameter, this is enough.
per platform customizations will be done through the init
script of the platform.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This commit is contained in:
Emmanuel Grumbach 2016-03-14 15:21:06 +02:00
parent 0f851bbc28
commit 3a171386f9
2 changed files with 0 additions and 17 deletions

View File

@ -88,16 +88,6 @@ config IWLWIFI_BCAST_FILTERING
If unsure, don't enable this option, as some programs might If unsure, don't enable this option, as some programs might
expect incoming broadcasts for their normal operations. 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 config IWLWIFI_PCIE_RTPM
bool "Enable runtime power management mode for PCIe devices" bool "Enable runtime power management mode for PCIe devices"
depends on IWLMVM && PM depends on IWLMVM && PM

View File

@ -1560,9 +1560,7 @@ struct iwl_mod_params iwlwifi_mod_params = {
.power_level = IWL_POWER_INDEX_1, .power_level = IWL_POWER_INDEX_1,
.d0i3_disable = true, .d0i3_disable = true,
.d0i3_entry_delay = 1000, .d0i3_entry_delay = 1000,
#ifndef CONFIG_IWLWIFI_UAPSD
.uapsd_disable = IWL_DISABLE_UAPSD_BSS | IWL_DISABLE_UAPSD_P2P_CLIENT, .uapsd_disable = IWL_DISABLE_UAPSD_BSS | IWL_DISABLE_UAPSD_P2P_CLIENT,
#endif /* CONFIG_IWLWIFI_UAPSD */
/* the rest are 0 by default */ /* the rest are 0 by default */
}; };
IWL_EXPORT_SYMBOL(iwlwifi_mod_params); IWL_EXPORT_SYMBOL(iwlwifi_mod_params);
@ -1682,13 +1680,8 @@ MODULE_PARM_DESC(lar_disable, "disable LAR functionality (default: N)");
module_param_named(uapsd_disable, iwlwifi_mod_params.uapsd_disable, module_param_named(uapsd_disable, iwlwifi_mod_params.uapsd_disable,
uint, S_IRUGO | S_IWUSR); uint, S_IRUGO | S_IWUSR);
#ifdef CONFIG_IWLWIFI_UAPSD
MODULE_PARM_DESC(uapsd_disable,
"disable U-APSD functionality bitmap 1: BSS 2: P2P Client (default: 0)");
#else
MODULE_PARM_DESC(uapsd_disable, MODULE_PARM_DESC(uapsd_disable,
"disable U-APSD functionality bitmap 1: BSS 2: P2P Client (default: 3)"); "disable U-APSD functionality bitmap 1: BSS 2: P2P Client (default: 3)");
#endif
/* /*
* set bt_coex_active to true, uCode will do kill/defer * set bt_coex_active to true, uCode will do kill/defer