summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-05-06 20:05:51 +0200
committerJohn W. Linville <linville@tuxdriver.com>2014-05-06 20:05:51 +0200
commitcabae81103584a8265114a543555781b7b0c88bd (patch)
tree0440190f176d6c590f712b78c8d8274b536ced3a /include/net
parentrtl8192cu: Fix unbalanced irq enable in error path of rtl92cu_hw_init() (diff)
parentmac80211: fix nested rtnl locking on ieee80211_reconfig (diff)
downloadlinux-cabae81103584a8265114a543555781b7b0c88bd.tar.xz
linux-cabae81103584a8265114a543555781b7b0c88bd.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'include/net')
-rw-r--r--include/net/cfg80211.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index f3539a15c411..f856e5a746fa 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -3669,6 +3669,18 @@ void cfg80211_sched_scan_results(struct wiphy *wiphy);
void cfg80211_sched_scan_stopped(struct wiphy *wiphy);
/**
+ * cfg80211_sched_scan_stopped_rtnl - notify that the scheduled scan has stopped
+ *
+ * @wiphy: the wiphy on which the scheduled scan stopped
+ *
+ * The driver can call this function to inform cfg80211 that the
+ * scheduled scan had to be stopped, for whatever reason. The driver
+ * is then called back via the sched_scan_stop operation when done.
+ * This function should be called with rtnl locked.
+ */
+void cfg80211_sched_scan_stopped_rtnl(struct wiphy *wiphy);
+
+/**
* cfg80211_inform_bss_width_frame - inform cfg80211 of a received BSS frame
*
* @wiphy: the wiphy reporting the BSS