diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-05-13 14:52:34 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-05-13 14:52:34 -0400 |
commit | 209f6c37540a6cc1c74333a7ede0da729488a8cd (patch) | |
tree | e7c040198825b713b1b5b8d467e06d45d1faf6a1 /drivers/net/wireless/iwlwifi/mvm/utils.c | |
parent | 03e5da151b8e390f2e28c4edf8fbbb6ca6d7a7ed (diff) | |
parent | b538b8ce76f69f7fa225bc0817bbb361b877ea23 (diff) |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/utils.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/utils.c | 16 |
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 6fdbef9696d8..2180902266ae 100644 --- a/drivers/net/wireless/iwlwifi/mvm/utils.c +++ b/drivers/net/wireless/iwlwifi/mvm/utils.c | |||
@@ -645,21 +645,21 @@ bool iwl_mvm_low_latency(struct iwl_mvm *mvm) | |||
645 | return result; | 645 | return result; |
646 | } | 646 | } |
647 | 647 | ||
648 | static void iwl_mvm_assoc_iter(void *_data, u8 *mac, struct ieee80211_vif *vif) | 648 | static void iwl_mvm_idle_iter(void *_data, u8 *mac, struct ieee80211_vif *vif) |
649 | { | 649 | { |
650 | bool *assoc = _data; | 650 | bool *idle = _data; |
651 | 651 | ||
652 | if (vif->bss_conf.assoc) | 652 | if (!vif->bss_conf.idle) |
653 | *assoc = true; | 653 | *idle = false; |
654 | } | 654 | } |
655 | 655 | ||
656 | bool iwl_mvm_is_associated(struct iwl_mvm *mvm) | 656 | bool iwl_mvm_is_idle(struct iwl_mvm *mvm) |
657 | { | 657 | { |
658 | bool assoc = false; | 658 | bool idle = true; |
659 | 659 | ||
660 | ieee80211_iterate_active_interfaces_atomic( | 660 | ieee80211_iterate_active_interfaces_atomic( |
661 | mvm->hw, IEEE80211_IFACE_ITER_NORMAL, | 661 | mvm->hw, IEEE80211_IFACE_ITER_NORMAL, |
662 | iwl_mvm_assoc_iter, &assoc); | 662 | iwl_mvm_idle_iter, &idle); |
663 | 663 | ||
664 | return assoc; | 664 | return idle; |
665 | } | 665 | } |