cfg80211: pass DFS region to drivers through reg_notifier()

This grants drivers access to the DFS region that a
regulatory domain belongs to.

Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/include/net/regulatory.h b/include/net/regulatory.h
index 7399c93cb4bc9ee61cd7b667a8c6579d5b17cd67..a5f79933e211216668a9b4cf573e73ec2e26d912 100644 (file)
--- a/include/net/regulatory.h
+++ b/include/net/regulatory.h
@@ -48,6 +48,10 @@ enum environment_cap {
  *     99 - built by driver but a specific alpha2 cannot be determined
  *     98 - result of an intersection between two regulatory domains
  *     97 - regulatory domain has not yet been configured
+ * @dfs_region: If CRDA responded with a regulatory domain that requires
+ *     DFS master operation on a known DFS region (NL80211_DFS_*),
+ *     dfs_region represents that region. Drivers can use this and the
+ *     @alpha2 to adjust their device's DFS parameters as required.
  * @intersect: indicates whether the wireless core should intersect
  *     the requested regulatory domain with the presently set regulatory
  *     domain.
@@ -67,6 +71,7 @@ struct regulatory_request {
        int wiphy_idx;
        enum nl80211_reg_initiator initiator;
        char alpha2[2];
+       u8 dfs_region;
        bool intersect;
        bool processed;
        enum environment_cap country_ie_env;

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 69141ed1f6dfea2b89cad572ddabf564bfdb20c8..b66444d048d57db72652afd254b16a65eccf001f 100644 (file)
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1121,6 +1121,8 @@ static void wiphy_update_regulatory(struct wiphy *wiphy,
        if (ignore_reg_update(wiphy, initiator))
                return;
 
+       last_request->dfs_region = cfg80211_regdomain->dfs_region;
+
        for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
                if (wiphy->bands[band])
                        handle_band(wiphy, band, initiator);