aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-scan.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2010-04-27 05:59:34 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-04-27 16:09:23 -0400
commita060bbfe4ee95d115e8f9705a66894ac34e2c475 (patch)
tree6aea616cdd07c06886c0e1ffade68e5d58f9e9c2 /drivers/net/wireless/iwlwifi/iwl-scan.c
parent9043f3b89abebfbfe4b8d64c7b71b9ac0b9eaa0b (diff)
mac80211: give virtual interface to hw_scan
When scanning, it is somewhat important to scan on the correct virtual interface. All drivers that currently implement hw_scan only support a single virtual interface, but that may change and then we'd want to be ready. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-scan.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-scan.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index 1bc1d29f2a07..447c3018296d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -312,7 +312,8 @@ static int iwl_scan_initiate(struct iwl_priv *priv)
312} 312}
313 313
314int iwl_mac_hw_scan(struct ieee80211_hw *hw, 314int iwl_mac_hw_scan(struct ieee80211_hw *hw,
315 struct cfg80211_scan_request *req) 315 struct ieee80211_vif *vif,
316 struct cfg80211_scan_request *req)
316{ 317{
317 struct iwl_priv *priv = hw->priv; 318 struct iwl_priv *priv = hw->priv;
318 int ret; 319 int ret;