diff options
| author | Arik Nemtsov <arik@wizery.com> | 2014-03-04 19:58:46 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-03-12 09:57:22 +0200 |
| commit | 90d4f7db6c5d8af1f4eab7bc714ec0ee130f9f00 (patch) | |
| tree | 58eff677b3afdc343166bf0fb3a4d22226237a32 /drivers/net/wireless/iwlwifi/mvm/fw.c | |
| parent | dcaf9f5ecb6f395152609bdc40660d9b593dca63 (diff) | |
| download | talos-op-linux-90d4f7db6c5d8af1f4eab7bc714ec0ee130f9f00.tar.gz talos-op-linux-90d4f7db6c5d8af1f4eab7bc714ec0ee130f9f00.zip | |
iwlwifi: mvm: init country code on init/recovery
During init queue a regulatory update to retrieve the default
regulatory settings from FW. If we're during recovery, only replay the
current country code to FW, if it exists.
Signed-off-by: Arik Nemtsov <arikx.nemtsov@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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw.c b/drivers/net/wireless/iwlwifi/mvm/fw.c index a81da4cde643..c03bde093927 100644 --- a/drivers/net/wireless/iwlwifi/mvm/fw.c +++ b/drivers/net/wireless/iwlwifi/mvm/fw.c @@ -739,6 +739,10 @@ int iwl_mvm_up(struct iwl_mvm *mvm) if (ret) goto error; + ret = iwl_mvm_init_mcc(mvm); + if (ret) + goto error; + if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN) { ret = iwl_mvm_config_scan(mvm); if (ret) |
