Merge commit 'c1e140bf79d817d4a7aa9932eb98b0359c87af33' from mac80211-next

[cascardo/linux.git] / net / wireless / core.h

diff --git a/net/wireless/core.h b/net/wireless/core.h
index faa5b16..801cd49 100644 (file)
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -36,6 +36,13 @@ struct cfg80211_registered_device {
         * the country on the country IE changed. */
        char country_ie_alpha2[2];
 
+       /*
+        * the driver requests the regulatory core to set this regulatory
+        * domain as the wiphy's. Only used for %REGULATORY_WIPHY_SELF_MANAGED
+        * devices using the regulatory_set_wiphy_regd() API
+        */
+       const struct ieee80211_regdomain *requested_regd;
+
        /* If a Country IE has been received this tells us the environment
         * which its telling us its in. This defaults to ENVIRON_ANY */
        enum environment_cap env;
@@ -63,7 +70,7 @@ struct cfg80211_registered_device {
        u32 bss_generation;
        struct cfg80211_scan_request *scan_req; /* protected by RTNL */
        struct sk_buff *scan_msg;
-       struct cfg80211_sched_scan_request *sched_scan_req;
+       struct cfg80211_sched_scan_request __rcu *sched_scan_req;
        unsigned long suspend_at;
        struct work_struct scan_done_wk;
        struct work_struct sched_scan_results_wk;
@@ -84,6 +91,8 @@ struct cfg80211_registered_device {
        struct list_head destroy_list;
        struct work_struct destroy_work;
 
+       struct work_struct sched_scan_stop_wk;
+
        /* must be last because of the way we do wiphy_priv(),
         * and it should at least be aligned to NETDEV_ALIGN */
        struct wiphy wiphy __aligned(NETDEV_ALIGN);