diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-01-28 03:17:18 -0500 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-02-03 15:43:56 -0500 |
commit | c1cb92fc1ecd2159b7fb148ed8d5f09d511ae030 (patch) | |
tree | c5c4838bfb83c9f2ee3123e2c8ced4e5ec29deb8 /drivers/net/wireless/iwlwifi/mvm/fw.c | |
parent | 474b50c30864a342d47e5d4a4a69df5750fa4254 (diff) |
iwlwifi: mvm: remove support for legacy power API
If the driver detects old firmware, we disable support for
power management.
This greatly simplifies the code.
Reviewed-by: Alexander Bondar <alexander.bondar@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/fw.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/fw.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw.c b/drivers/net/wireless/iwlwifi/mvm/fw.c index 212ffecf038b..155bb20519c2 100644 --- a/drivers/net/wireless/iwlwifi/mvm/fw.c +++ b/drivers/net/wireless/iwlwifi/mvm/fw.c | |||
@@ -442,7 +442,13 @@ int iwl_mvm_up(struct iwl_mvm *mvm) | |||
442 | /* Initialize tx backoffs to the minimal possible */ | 442 | /* Initialize tx backoffs to the minimal possible */ |
443 | iwl_mvm_tt_tx_backoff(mvm, 0); | 443 | iwl_mvm_tt_tx_backoff(mvm, 0); |
444 | 444 | ||
445 | ret = iwl_mvm_power_update_device_mode(mvm); | 445 | if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_PM_CMD_SUPPORT)) { |
446 | ret = iwl_power_legacy_set_cam_mode(mvm); | ||
447 | if (ret) | ||
448 | goto error; | ||
449 | } | ||
450 | |||
451 | ret = iwl_mvm_power_update_device(mvm); | ||
446 | if (ret) | 452 | if (ret) |
447 | goto error; | 453 | goto error; |
448 | 454 | ||