diff options
| author | Ilan Peer <ilan.peer@intel.com> | 2013-06-16 05:18:11 -0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-07-31 05:05:00 -0400 |
| commit | fd11bd05552e8639abbdc2f1d478f70dfb9b5e3e (patch) | |
| tree | 607b4d2586b490c10e2cd63aca20eb941c6d32e3 | |
| parent | 0f2ed58e6e185bb7f22a534d12b755b7459177ef (diff) | |
iwlwifi: mvm: Return on inconsistency in add interface
Return in case that HW restart is in progress but the added
interface is not found during the iteration over all the interfaces.
Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c index 94aae9c8562c..5fe23a5ea9b6 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | |||
| @@ -264,7 +264,8 @@ static int iwl_mvm_mac_ctxt_allocate_resources(struct iwl_mvm *mvm, | |||
| 264 | return 0; | 264 | return 0; |
| 265 | 265 | ||
| 266 | /* Therefore, in recovery, we can't get here */ | 266 | /* Therefore, in recovery, we can't get here */ |
| 267 | WARN_ON_ONCE(test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status)); | 267 | if (WARN_ON_ONCE(test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status))) |
| 268 | return -EBUSY; | ||
| 268 | 269 | ||
| 269 | mvmvif->id = find_first_bit(data.available_mac_ids, | 270 | mvmvif->id = find_first_bit(data.available_mac_ids, |
| 270 | NUM_MAC_INDEX_DRIVER); | 271 | NUM_MAC_INDEX_DRIVER); |