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/driver-ops.h | |
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/driver-ops.h')
-rw-r--r-- | net/mac80211/driver-ops.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h index d1f8a7c2225a..997008e236ff 100644 --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h | |||
@@ -154,14 +154,15 @@ static inline void drv_update_tkip_key(struct ieee80211_local *local, | |||
154 | } | 154 | } |
155 | 155 | ||
156 | static inline int drv_hw_scan(struct ieee80211_local *local, | 156 | static inline int drv_hw_scan(struct ieee80211_local *local, |
157 | struct ieee80211_sub_if_data *sdata, | ||
157 | struct cfg80211_scan_request *req) | 158 | struct cfg80211_scan_request *req) |
158 | { | 159 | { |
159 | int ret; | 160 | int ret; |
160 | 161 | ||
161 | might_sleep(); | 162 | might_sleep(); |
162 | 163 | ||
163 | ret = local->ops->hw_scan(&local->hw, req); | 164 | ret = local->ops->hw_scan(&local->hw, &sdata->vif, req); |
164 | trace_drv_hw_scan(local, req, ret); | 165 | trace_drv_hw_scan(local, sdata, req, ret); |
165 | return ret; | 166 | return ret; |
166 | } | 167 | } |
167 | 168 | ||