xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next

Browse Source 
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

Conflicts:
	drivers/net/wireless/iwlwifi/mvm/mac80211.c
This commit is contained in:
Emmanuel Grumbach
2014-05-21 12:49:38 +03:00
parent 5344669989 7bacc78227
commit 0ccab3db2b
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/wireless/iwlwifi/mvm/utils.c
View File

@@ -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;
}