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

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/wireless/iwlwifi/mvm/utils.c b/drivers/net/wireless/iwlwifi/mvm/utils.c
index 42cea32ac546..01ad73026bfa 100644
--- a/drivers/net/wireless/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/iwlwifi/mvm/utils.c
@@ -724,21 +724,21 @@ bool iwl_mvm_low_latency(struct iwl_mvm *mvm)
         return result;
 }
 
-static void iwl_mvm_assoc_iter(void *_data, u8 *mac, struct ieee80211_vif *vif)
+static void iwl_mvm_idle_iter(void *_data, u8 *mac, struct ieee80211_vif *vif)
 {
-        bool *assoc = _data;
+        bool *idle = _data;
 
-        if (vif->bss_conf.assoc)
-                *assoc = true;
+        if (!vif->bss_conf.idle)
+                *idle = false;
 }
 
-bool iwl_mvm_is_associated(struct iwl_mvm *mvm)
+bool iwl_mvm_is_idle(struct iwl_mvm *mvm)
 {
-        bool assoc = false;
+        bool idle = true;
 
         ieee80211_iterate_active_interfaces_atomic(
                         mvm->hw, IEEE80211_IFACE_ITER_NORMAL,
-                        iwl_mvm_assoc_iter, &assoc);
+                        iwl_mvm_idle_iter, &idle);
 
-        return assoc;
+        return idle;
 }