summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
diff options
context:
space:
mode:
authorEmmanuel Grumbach2016-03-15 10:04:29 +0100
committerEmmanuel Grumbach2016-03-30 15:21:23 +0200
commit11dee0b4946bc8b0b4adc804f2110361fed81f08 (patch)
tree35602c229a3920c000a8b8603eda97116b195e98 /drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
parentiwlwifi: add missing mutex_destroy statements (diff)
downloadkernel-qcow2-linux-11dee0b4946bc8b0b4adc804f2110361fed81f08.tar.gz
kernel-qcow2-linux-11dee0b4946bc8b0b4adc804f2110361fed81f08.tar.xz
kernel-qcow2-linux-11dee0b4946bc8b0b4adc804f2110361fed81f08.zip
iwlwifi: make uapsd_disable module param a bitmap
This allows to disable uapsd for BSS only, or P2P client separately. Remove the now unneeded IWL_MVM_P2P_UAPSD_STANDALONE constant. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/mvm.h')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/mvm.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 2e0a8824aaba..02ef1d91478c 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -1072,7 +1072,8 @@ bool iwl_mvm_is_p2p_standalone_uapsd_supported(struct iwl_mvm *mvm)
{
return fw_has_capa(&mvm->fw->ucode_capa,
IWL_UCODE_TLV_CAPA_P2P_STANDALONE_UAPSD) &&
- IWL_MVM_P2P_UAPSD_STANDALONE;
+ !(iwlwifi_mod_params.uapsd_disable &
+ IWL_DISABLE_UAPSD_P2P_CLIENT);
}
static inline bool iwl_mvm_has_new_rx_api(struct iwl_mvm *mvm)