aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorVidyullatha Kanchanapally <vkanchan@qti.qualcomm.com>2015-10-30 19:14:50 +0530
committerJohannes Berg <johannes.berg@intel.com>2015-12-04 14:43:32 +0100
commit91f123f20d64c99db0ce8d2bbc5bb82012d3cc1a (patch)
tree668ce0faf5f3cd0477ecb8f477cccc0e1fb15d81 /net
parentcfg80211: Add support for aborting an ongoing scan (diff)
downloadlinux-dev-91f123f20d64c99db0ce8d2bbc5bb82012d3cc1a.tar.xz
linux-dev-91f123f20d64c99db0ce8d2bbc5bb82012d3cc1a.zip
mac80211: Add support for aborting an ongoing scan
This commit adds implementation for abort scan in mac80211. Reviewed-by: Jouni Malinen <jouni@qca.qualcomm.com> Signed-off-by: Vidyullatha Kanchanapally <vkanchan@qti.qualcomm.com> Signed-off-by: Sunil Dutt <usdutt@qti.qualcomm.com> [adjust to wdev change in previous patch and clean up code a bit] Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/cfg.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index da471eef07bb..763f2eb9b887 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1994,6 +1994,11 @@ static int ieee80211_scan(struct wiphy *wiphy,
return ieee80211_request_scan(sdata, req);
}
+static void ieee80211_abort_scan(struct wiphy *wiphy, struct wireless_dev *wdev)
+{
+ ieee80211_scan_cancel(wiphy_priv(wiphy));
+}
+
static int
ieee80211_sched_scan_start(struct wiphy *wiphy,
struct net_device *dev,
@@ -3842,6 +3847,7 @@ const struct cfg80211_ops mac80211_config_ops = {
.suspend = ieee80211_suspend,
.resume = ieee80211_resume,
.scan = ieee80211_scan,
+ .abort_scan = ieee80211_abort_scan,
.sched_scan_start = ieee80211_sched_scan_start,
.sched_scan_stop = ieee80211_sched_scan_stop,
.auth = ieee80211_auth,