diff options
author | Eliad Peller <eliad@wizery.com> | 2014-12-14 10:49:28 -0500 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-12-28 13:00:20 -0500 |
commit | b0677f71333032c384641b874c26b8871431a009 (patch) | |
tree | 19ce9c7230b432379f0f71278e8c39d811a9b10f | |
parent | 6735943fafeaf55223b8704e52568b89ac3129e3 (diff) |
iwlwifi: mvm: consider d0i3_disable in iwl_mvm_is_d0i3_supported()
Consider the iwlwifi module param d0i3_disable when
considering whether d0i3 is supported.
(There is currently no need to differentiate between
supported and enabled, so keep the function as-is)
Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mvm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h index 33a674af606c..b2100b414055 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mvm.h +++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h | |||
@@ -851,6 +851,7 @@ static inline bool iwl_mvm_is_d0i3_supported(struct iwl_mvm *mvm) | |||
851 | { | 851 | { |
852 | return mvm->trans->cfg->d0i3 && | 852 | return mvm->trans->cfg->d0i3 && |
853 | mvm->trans->d0i3_mode != IWL_D0I3_MODE_OFF && | 853 | mvm->trans->d0i3_mode != IWL_D0I3_MODE_OFF && |
854 | !iwlwifi_mod_params.d0i3_disable && | ||
854 | (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_D0I3_SUPPORT); | 855 | (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_D0I3_SUPPORT); |
855 | } | 856 | } |
856 | 857 | ||