lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iwlwifi: queue user-initiated scan when doing internal scan

Browse Source 
The internal scanning created a problem where
when userspace tries to scan, the scan gets
rejected. Instead of doing that, queue up the
user-initiated scan when doing an internal
scan.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
This commit is contained in:
Johannes Berg
2010-05-18 02:29:13 -07:00
committed by Reinette Chatre
parent 0e1654fa2b
commit f84b29ec0a
3 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/iwlwifi/iwl-core.c
View File

@@ -1960,6 +1960,11 @@ void iwl_mac_remove_interface(struct ieee80211_hw *hw,
} }
if (priv->vif == vif) { if (priv->vif == vif) {
priv->vif = NULL; priv->vif = NULL;
if (priv->scan_vif == vif) {
ieee80211_scan_completed(priv->hw, true);
priv->scan_vif = NULL;
priv->scan_request = NULL;
}
memset(priv->bssid, 0, ETH_ALEN); memset(priv->bssid, 0, ETH_ALEN);
} }
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);

1
drivers/net/wireless/iwlwifi/iwl-dev.h
View File

@@ -1130,6 +1130,7 @@ struct iwl_priv {
void *scan_cmd; void *scan_cmd;
enum ieee80211_band scan_band; enum ieee80211_band scan_band;
struct cfg80211_scan_request *scan_request; struct cfg80211_scan_request *scan_request;
struct ieee80211_vif *scan_vif;
bool is_internal_short_scan; bool is_internal_short_scan;
u8 scan_tx_ant[IEEE80211_NUM_BANDS]; u8 scan_tx_ant[IEEE80211_NUM_BANDS];
u8 mgmt_tx_ant; u8 mgmt_tx_ant;

34
drivers/net/wireless/iwlwifi/iwl-scan.c
View File

@@ -333,7 +333,8 @@ int iwl_mac_hw_scan(struct ieee80211_hw *hw,
goto out_unlock; goto out_unlock;
} }
if (test_bit(STATUS_SCANNING, &priv->status)) { if (test_bit(STATUS_SCANNING, &priv->status) &&
!priv->is_internal_short_scan) {
IWL_DEBUG_SCAN(priv, "Scan already in progress.\n"); IWL_DEBUG_SCAN(priv, "Scan already in progress.\n");
ret = -EAGAIN; ret = -EAGAIN;
goto out_unlock; goto out_unlock;
@@ -348,7 +349,15 @@ int iwl_mac_hw_scan(struct ieee80211_hw *hw,
/* mac80211 will only ask for one band at a time */ /* mac80211 will only ask for one band at a time */
priv->scan_band = req->channels[0]->band; priv->scan_band = req->channels[0]->band;
priv->scan_request = req; priv->scan_request = req;
priv->scan_vif = vif;
/*
* If an internal scan is in progress, just set
* up the scan_request as per above.
*/
if (priv->is_internal_short_scan)
ret = 0;
else
ret = iwl_scan_initiate(priv, vif); ret = iwl_scan_initiate(priv, vif);
IWL_DEBUG_MAC80211(priv, "leave\n"); IWL_DEBUG_MAC80211(priv, "leave\n");
@@ -513,7 +522,21 @@ void iwl_bg_scan_completed(struct work_struct *work)
priv->is_internal_short_scan = false; priv->is_internal_short_scan = false;
IWL_DEBUG_SCAN(priv, "internal short scan completed\n"); IWL_DEBUG_SCAN(priv, "internal short scan completed\n");
internal = true; internal = true;
} else {
priv->scan_request = NULL;
priv->scan_vif = NULL;
} }
if (test_bit(STATUS_EXIT_PENDING, &priv->status))
goto out;
if (internal && priv->scan_request)
iwl_scan_initiate(priv, priv->scan_vif);
/* Since setting the TXPOWER may have been deferred while
* performing the scan, fire one off */
iwl_set_tx_power(priv, priv->tx_power_user_lmt, true);
out:
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);
/* /*
@@ -523,15 +546,6 @@ void iwl_bg_scan_completed(struct work_struct *work)
*/ */
if (!internal) if (!internal)
ieee80211_scan_completed(priv->hw, false); ieee80211_scan_completed(priv->hw, false);
if (test_bit(STATUS_EXIT_PENDING, &priv->status))
return;
/* Since setting the TXPOWER may have been deferred while
* performing the scan, fire one off */
mutex_lock(&priv->mutex);
iwl_set_tx_power(priv, priv->tx_power_user_lmt, true);
mutex_unlock(&priv->mutex);
} }
EXPORT_SYMBOL(iwl_bg_scan_completed); EXPORT_SYMBOL(iwl_bg_scan_completed);