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/wireless/sme.c | |
| parent | 1c90f9d404a45a1677c1e5791f5a2a8aaee0370a (diff) | |
| download | linux-stable-fd0142844efa85d89017c89227a0f03de1eee327.tar.gz linux-stable-fd0142844efa85d89017c89227a0f03de1eee327.tar.bz2 linux-stable-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/wireless/sme.c')
| -rw-r--r-- | net/wireless/sme.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index dec97981e689..6f39cb808302 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -136,15 +136,15 @@ static int cfg80211_conn_scan(struct wireless_dev *wdev) wdev->conn->params.ssid_len); request->ssids[0].ssid_len = wdev->conn->params.ssid_len; - request->dev = wdev->netdev; + request->wdev = wdev; request->wiphy = &rdev->wiphy; rdev->scan_req = request; - err = rdev->ops->scan(wdev->wiphy, wdev->netdev, request); + err = rdev->ops->scan(wdev->wiphy, request); if (!err) { wdev->conn->state = CFG80211_CONN_SCANNING; - nl80211_send_scan_start(rdev, wdev->netdev); + nl80211_send_scan_start(rdev, wdev); dev_hold(wdev->netdev); } else { rdev->scan_req = NULL; |