aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless/core.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-06-18 13:17:03 -0400
committerJohannes Berg <johannes.berg@intel.com>2012-07-12 06:10:41 -0400
commitfd0142844efa85d89017c89227a0f03de1eee327 (patch)
tree2b9977f712df0caa3ecda6dd59fe5b34932e2ab6 /net/wireless/core.c
parent1c90f9d404a45a1677c1e5791f5a2a8aaee0370a (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/core.c')
-rw-r--r--net/wireless/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 2781a411cecc..0557bb159025 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -708,7 +708,7 @@ static void wdev_cleanup_work(struct work_struct *work)
708 708
709 cfg80211_lock_rdev(rdev); 709 cfg80211_lock_rdev(rdev);
710 710
711 if (WARN_ON(rdev->scan_req && rdev->scan_req->dev == wdev->netdev)) { 711 if (WARN_ON(rdev->scan_req && rdev->scan_req->wdev == wdev)) {
712 rdev->scan_req->aborted = true; 712 rdev->scan_req->aborted = true;
713 ___cfg80211_scan_done(rdev, true); 713 ___cfg80211_scan_done(rdev, true);
714 } 714 }