korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-29 05:55:02 +08:00
Code Issues 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
commit 0ccab3db2b
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/iwlwifi/mvm/mac80211.c
View File

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

2
drivers/net/wireless/iwlwifi/mvm/mvm.h
View File

@ -1033,7 +1033,7 @@ static inline bool iwl_mvm_vif_low_latency(struct iwl_mvm_vif *mvmvif)
}
/* Assoc status */
bool iwl_mvm_is_associated(struct iwl_mvm *mvm);
bool iwl_mvm_is_idle(struct iwl_mvm *mvm);
/* Thermal management and CT-kill */
void iwl_mvm_tt_tx_backoff(struct iwl_mvm *mvm, u32 backoff);

2
drivers/net/wireless/iwlwifi/mvm/scan.c
View File

@ -740,7 +740,7 @@ int iwl_mvm_config_sched_scan(struct iwl_mvm *mvm,
int band_2ghz = mvm->nvm_data->bands[IEEE80211_BAND_2GHZ].n_channels;
int band_5ghz = mvm->nvm_data->bands[IEEE80211_BAND_5GHZ].n_channels;
int head = 0;
int tail = band_2ghz + band_5ghz;
int tail = band_2ghz + band_5ghz - 1;
u32 ssid_bitmap;
int cmd_len;
int ret;

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