From 91edbb6c9c39ab05d4dee75305fa3d9bb208749f Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 22 Sep 2011 15:14:57 -0700 Subject: [PATCH] --- yaml --- r: 266383 b: refs/heads/master c: 98efb4a52b5c64c79647ea4fdb2c6a3f3db6e743 h: refs/heads/master i: 266381: d9f537de9f701fe466a9777979de54ddb3b8763c 266379: 15790fee826680d0bb36d0b5ae4b65d443885311 266375: 7b286d4df499fd4f3822d8be552152bd652c8711 266367: 80fcd03fef8fc1d4dff0afc43eae96486454b26f v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-core.h | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-scan.c | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d90df2e91333..44f8a5112b95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0288356272153f916f31b8331780a7336872f63b +refs/heads/master: 98efb4a52b5c64c79647ea4fdb2c6a3f3db6e743 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-core.h b/trunk/drivers/net/wireless/iwlwifi/iwl-core.h index 8ed72e8f35e4..e55ffad83950 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-core.h @@ -318,7 +318,7 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force); ******************************************************************************/ void iwl_init_scan_params(struct iwl_priv *priv); int iwl_scan_cancel(struct iwl_priv *priv); -int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms); +void iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms); void iwl_force_scan_end(struct iwl_priv *priv); int iwl_mac_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif, diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c b/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c index 74204ec5b267..d9596ba39b82 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c @@ -169,7 +169,7 @@ int iwl_scan_cancel(struct iwl_priv *priv) * @ms: amount of time to wait (in milliseconds) for scan to abort * */ -int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms) +void iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms) { unsigned long timeout = jiffies + msecs_to_jiffies(ms); @@ -184,8 +184,6 @@ int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms) break; msleep(20); } - - return test_bit(STATUS_SCAN_HW, &priv->shrd->status); } /* Service response to REPLY_SCAN_CMD (0x80) */