diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-06-18 13:17:03 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-07-12 06:10:41 -0400 |
commit | fd0142844efa85d89017c89227a0f03de1eee327 (patch) | |
tree | 2b9977f712df0caa3ecda6dd59fe5b34932e2ab6 /net/wireless/sme.c | |
parent | 1c90f9d404a45a1677c1e5791f5a2a8aaee0370a (diff) |
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) | |||
136 | wdev->conn->params.ssid_len); | 136 | wdev->conn->params.ssid_len); |
137 | request->ssids[0].ssid_len = wdev->conn->params.ssid_len; | 137 | request->ssids[0].ssid_len = wdev->conn->params.ssid_len; |
138 | 138 | ||
139 | request->dev = wdev->netdev; | 139 | request->wdev = wdev; |
140 | request->wiphy = &rdev->wiphy; | 140 | request->wiphy = &rdev->wiphy; |
141 | 141 | ||
142 | rdev->scan_req = request; | 142 | rdev->scan_req = request; |
143 | 143 | ||
144 | err = rdev->ops->scan(wdev->wiphy, wdev->netdev, request); | 144 | err = rdev->ops->scan(wdev->wiphy, request); |
145 | if (!err) { | 145 | if (!err) { |
146 | wdev->conn->state = CFG80211_CONN_SCANNING; | 146 | wdev->conn->state = CFG80211_CONN_SCANNING; |
147 | nl80211_send_scan_start(rdev, wdev->netdev); | 147 | nl80211_send_scan_start(rdev, wdev); |
148 | dev_hold(wdev->netdev); | 148 | dev_hold(wdev->netdev); |
149 | } else { | 149 | } else { |
150 | rdev->scan_req = NULL; | 150 | rdev->scan_req = NULL; |