summaryrefslogtreecommitdiffstats
path: root/net/mac80211/driver-ops.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2010-04-27 11:59:34 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-04-27 16:09:23 -0400
commita060bbfe4ee95d115e8f9705a66894ac34e2c475 (patch)
tree6aea616cdd07c06886c0e1ffade68e5d58f9e9c2 /net/mac80211/driver-ops.h
parent9043f3b89abebfbfe4b8d64c7b71b9ac0b9eaa0b (diff)
downloadop-kernel-dev-a060bbfe4ee95d115e8f9705a66894ac34e2c475.zip
op-kernel-dev-a060bbfe4ee95d115e8f9705a66894ac34e2c475.tar.gz
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.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index d1f8a7c..997008e 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,
}
static inline int drv_hw_scan(struct ieee80211_local *local,
+ struct ieee80211_sub_if_data *sdata,
struct cfg80211_scan_request *req)
{
int ret;
might_sleep();
- ret = local->ops->hw_scan(&local->hw, req);
- trace_drv_hw_scan(local, req, ret);
+ ret = local->ops->hw_scan(&local->hw, &sdata->vif, req);
+ trace_drv_hw_scan(local, sdata, req, ret);
return ret;
}
OpenPOWER on IntegriCloud