cfg80211: process regulatory DFS region for countries

The wireless-regdb now has support for mapping a country to
one DFS region. CRDA sends this to us now so process it
so we can provide that hint to drivers. This will later be
used by code for processing DFS in a way that meets the
criteria for the DFS region the country belongs to.

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

1 files changed, 15 insertions, 0 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 6bc7c4b32fa5..50482e129263 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -199,6 +199,7 @@ static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = {
         [NL80211_ATTR_DONT_WAIT_FOR_ACK] = { .type = NLA_FLAG },
         [NL80211_ATTR_PROBE_RESP] = { .type = NLA_BINARY,
                                       .len = IEEE80211_MAX_DATA_LEN },
+        [NL80211_ATTR_DFS_REGION] = { .type = NLA_U8 },
 };
 
 /* policy for the key attributes */
@@ -3382,6 +3383,9 @@ static int nl80211_get_reg(struct sk_buff *skb, struct genl_info *info)
 
         NLA_PUT_STRING(msg, NL80211_ATTR_REG_ALPHA2,
                 cfg80211_regdomain->alpha2);
+        if (cfg80211_regdomain->dfs_region)
+                NLA_PUT_U8(msg, NL80211_ATTR_DFS_REGION,
+                           cfg80211_regdomain->dfs_region);
 
         nl_reg_rules = nla_nest_start(msg, NL80211_ATTR_REG_RULES);
         if (!nl_reg_rules)
@@ -3440,6 +3444,7 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
         char *alpha2 = NULL;
         int rem_reg_rules = 0, r = 0;
         u32 num_rules = 0, rule_idx = 0, size_of_regd;
+        u8 dfs_region = 0;
         struct ieee80211_regdomain *rd = NULL;
 
         if (!info->attrs[NL80211_ATTR_REG_ALPHA2])
@@ -3450,6 +3455,9 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
 
         alpha2 = nla_data(info->attrs[NL80211_ATTR_REG_ALPHA2]);
 
+        if (info->attrs[NL80211_ATTR_DFS_REGION])
+                dfs_region = nla_get_u8(info->attrs[NL80211_ATTR_DFS_REGION]);
+
         nla_for_each_nested(nl_reg_rule, info->attrs[NL80211_ATTR_REG_RULES],
                         rem_reg_rules) {
                 num_rules++;
@@ -3477,6 +3485,13 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
         rd->alpha2[0] = alpha2[0];
         rd->alpha2[1] = alpha2[1];
 
+        /*
+         * Disable DFS master mode if the DFS region was
+         * not supported or known on this kernel.
+         */
+        if (reg_supported_dfs_region(dfs_region))
+                rd->dfs_region = dfs_region;
+
         nla_for_each_nested(nl_reg_rule, info->attrs[NL80211_ATTR_REG_RULES],
                         rem_reg_rules) {
                 nla_parse(tb, NL80211_REG_RULE_ATTR_MAX,