diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2010-04-27 05:59:34 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-04-27 16:09:23 -0400 |
commit | a060bbfe4ee95d115e8f9705a66894ac34e2c475 (patch) | |
tree | 6aea616cdd07c06886c0e1ffade68e5d58f9e9c2 /net/mac80211/scan.c | |
parent | 9043f3b89abebfbfe4b8d64c7b71b9ac0b9eaa0b (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 'net/mac80211/scan.c')
-rw-r--r-- | net/mac80211/scan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index eb86a5f6e645..2b1f1f3d6a58 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c | |||
@@ -410,7 +410,7 @@ static int __ieee80211_start_scan(struct ieee80211_sub_if_data *sdata, | |||
410 | 410 | ||
411 | if (local->ops->hw_scan) { | 411 | if (local->ops->hw_scan) { |
412 | WARN_ON(!ieee80211_prep_hw_scan(local)); | 412 | WARN_ON(!ieee80211_prep_hw_scan(local)); |
413 | rc = drv_hw_scan(local, local->hw_scan_req); | 413 | rc = drv_hw_scan(local, sdata, local->hw_scan_req); |
414 | } else | 414 | } else |
415 | rc = ieee80211_start_sw_scan(local); | 415 | rc = ieee80211_start_sw_scan(local); |
416 | 416 | ||
@@ -654,7 +654,7 @@ void ieee80211_scan_work(struct work_struct *work) | |||
654 | } | 654 | } |
655 | 655 | ||
656 | if (local->hw_scan_req) { | 656 | if (local->hw_scan_req) { |
657 | int rc = drv_hw_scan(local, local->hw_scan_req); | 657 | int rc = drv_hw_scan(local, sdata, local->hw_scan_req); |
658 | mutex_unlock(&local->scan_mtx); | 658 | mutex_unlock(&local->scan_mtx); |
659 | if (rc) | 659 | if (rc) |
660 | ieee80211_scan_completed(&local->hw, true); | 660 | ieee80211_scan_completed(&local->hw, true); |