diff options
Diffstat (limited to 'net/wireless/scan.c')
| -rw-r--r-- | net/wireless/scan.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index a8d5a9a07e49..a957077dd961 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include "core.h" | 17 | #include "core.h" |
| 18 | #include "nl80211.h" | 18 | #include "nl80211.h" |
| 19 | #include "wext-compat.h" | 19 | #include "wext-compat.h" |
| 20 | #include "rdev-ops.h" | ||
| 20 | 21 | ||
| 21 | #define IEEE80211_SCAN_RESULT_EXPIRE (30 * HZ) | 22 | #define IEEE80211_SCAN_RESULT_EXPIRE (30 * HZ) |
| 22 | 23 | ||
| @@ -211,7 +212,7 @@ int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev, | |||
| 211 | dev = rdev->sched_scan_req->dev; | 212 | dev = rdev->sched_scan_req->dev; |
| 212 | 213 | ||
| 213 | if (!driver_initiated) { | 214 | if (!driver_initiated) { |
| 214 | int err = rdev->ops->sched_scan_stop(&rdev->wiphy, dev); | 215 | int err = rdev_sched_scan_stop(rdev, dev); |
| 215 | if (err) | 216 | if (err) |
| 216 | return err; | 217 | return err; |
| 217 | } | 218 | } |
| @@ -1052,7 +1053,7 @@ int cfg80211_wext_siwscan(struct net_device *dev, | |||
| 1052 | creq->rates[i] = (1 << wiphy->bands[i]->n_bitrates) - 1; | 1053 | creq->rates[i] = (1 << wiphy->bands[i]->n_bitrates) - 1; |
| 1053 | 1054 | ||
| 1054 | rdev->scan_req = creq; | 1055 | rdev->scan_req = creq; |
| 1055 | err = rdev->ops->scan(wiphy, creq); | 1056 | err = rdev_scan(rdev, creq); |
| 1056 | if (err) { | 1057 | if (err) { |
| 1057 | rdev->scan_req = NULL; | 1058 | rdev->scan_req = NULL; |
| 1058 | /* creq will be freed below */ | 1059 | /* creq will be freed below */ |