summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/iwlwifi/iwl-core.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-09-22 15:14:57 -0700
committerJohn W. Linville <linville@tuxdriver.com>2011-09-27 14:34:08 -0400
commit98efb4a52b5c64c79647ea4fdb2c6a3f3db6e743 (patch)
tree06d87025170ccef3f24f6d4f6676e4aa6bb2c810 /drivers/net/wireless/iwlwifi/iwl-core.h
parent0288356272153f916f31b8331780a7336872f63b (diff)
downloadlinux-3.10-98efb4a52b5c64c79647ea4fdb2c6a3f3db6e743.tar.gz
linux-3.10-98efb4a52b5c64c79647ea4fdb2c6a3f3db6e743.tar.bz2
linux-3.10-98efb4a52b5c64c79647ea4fdb2c6a3f3db6e743.zip
iwlagn: make iwl_scan_cancel_timeout void
The return value of iwl_scan_cancel_timeout() isn't used anywhere, so let's just remove it. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 8ed72e8f35e..e55ffad8395 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/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,