diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-06-18 19:17:03 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-07-12 12:10:41 +0200 |
| commit | fd0142844efa85d89017c89227a0f03de1eee327 (patch) | |
| tree | 2b9977f712df0caa3ecda6dd59fe5b34932e2ab6 /net/mac80211 | |
| parent | 1c90f9d404a45a1677c1e5791f5a2a8aaee0370a (diff) | |
| download | linux-3.10-fd0142844efa85d89017c89227a0f03de1eee327.tar.gz linux-3.10-fd0142844efa85d89017c89227a0f03de1eee327.tar.bz2 linux-3.10-fd0142844efa85d89017c89227a0f03de1eee327.zip | |
nl80211: move scan API to wdev
The new P2P Device will have to be able to scan for
P2P search, so move scanning to use struct wireless_dev
instead of struct net_device.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/cfg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index a752c7341d6..cfdc03f59e2 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1763,10 +1763,11 @@ static int ieee80211_resume(struct wiphy *wiphy) #endif static int ieee80211_scan(struct wiphy *wiphy, - struct net_device *dev, struct cfg80211_scan_request *req) { - struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_sub_if_data *sdata; + + sdata = IEEE80211_WDEV_TO_SUB_IF(req->wdev); switch (ieee80211_vif_type_p2p(&sdata->vif)) { case NL80211_IFTYPE_STATION: |