diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2013-03-06 11:34:44 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-03-20 12:01:54 +0100 |
| commit | b9545b48ff4c725ea71f1d9fd9b78da08ddd6551 (patch) | |
| tree | e35958145a3815f2d0ec9f20cecf2c71dbd42e28 /drivers/net/wireless/iwlwifi/mvm/fw.c | |
| parent | 25b9ea5c797b5d78f8ceced9ad9c7a7daf0db19c (diff) | |
| download | op-kernel-dev-b9545b48ff4c725ea71f1d9fd9b78da08ddd6551.zip op-kernel-dev-b9545b48ff4c725ea71f1d9fd9b78da08ddd6551.tar.gz | |
iwlwifi: mvm: MVM op_mode is supported on 7000 only
The code removed in this patch was used for bring up on
older NICs. No MVM capable fw will ever be released for
older NICs, so remove that code.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/fw.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/fw.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw.c b/drivers/net/wireless/iwlwifi/mvm/fw.c index 1006b32..d43e2a5 100644 --- a/drivers/net/wireless/iwlwifi/mvm/fw.c +++ b/drivers/net/wireless/iwlwifi/mvm/fw.c @@ -330,12 +330,10 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) if (ret) goto error; - /* WkP doesn't have all calibrations, need to set default values */ - if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_7000) { - ret = iwl_set_default_calibrations(mvm); - if (ret) - goto error; - } + /* need to set default values */ + ret = iwl_set_default_calibrations(mvm); + if (ret) + goto error; /* * Send phy configurations command to init uCode |
