diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-05-21 12:49:38 +0300 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-05-21 12:49:38 +0300 |
commit | 0ccab3db2b3d045905e4336a407a370ae0342d49 (patch) | |
tree | c9e9f6839419a850460e8eb74750c4ac28d142d1 /drivers/net/wireless/iwlwifi/mvm/mac80211.c | |
parent | 53446699892b7a171128295a85014732b9a1796b (diff) | |
parent | 7bacc782270ff7db3b9f29fa5d24ad2ee1e8e81d (diff) | |
download | op-kernel-dev-0ccab3db2b3d045905e4336a407a370ae0342d49.zip op-kernel-dev-0ccab3db2b3d045905e4336a407a370ae0342d49.tar.gz |
Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Conflicts:
drivers/net/wireless/iwlwifi/mvm/mac80211.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mac80211.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index 1c932e9..bdc8459 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c @@ -1832,7 +1832,7 @@ static int iwl_mvm_mac_sched_scan_start(struct ieee80211_hw *hw, mutex_lock(&mvm->mutex); - if (iwl_mvm_is_associated(mvm)) { + if (!iwl_mvm_is_idle(mvm)) { ret = -EBUSY; goto out; } |