diff options
author | Luis R. Rodriguez <mcgrof@qca.qualcomm.com> | 2011-10-04 12:50:32 -0700 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@qca.qualcomm.com> | 2011-10-10 16:39:10 -0700 |
commit | 8cbde0452c707ad0fab4ce65fcbd96cc10a8482d (patch) | |
tree | 5fe08071ebc00d3c24ca2558d22592e2a14fb8af | |
parent | e40afba19fef7c0c76939efc9ca4a593dfdaa840 (diff) | |
download | crda-8cbde0452c707ad0fab4ce65fcbd96cc10a8482d.tar.gz crda-8cbde0452c707ad0fab4ce65fcbd96cc10a8482d.tar.bz2 crda-8cbde0452c707ad0fab4ce65fcbd96cc10a8482d.zip |
crda: add support to send DFS master region
wireless-regdb now has support for a DFS master region
for each country. We must read this from the file and
send it as an NL80211_ATTR_DFS_REGION attribute.
We add a "creqs" value for the country structure but only
use the first two bits as that is all we need right now.
Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
-rw-r--r-- | crda.c | 1 | ||||
-rw-r--r-- | nl80211.h | 21 | ||||
-rw-r--r-- | regdb.h | 3 |
3 files changed, 24 insertions, 1 deletions
@@ -280,6 +280,7 @@ int main(int argc, char **argv) country->reg_collection_ptr); NLA_PUT_STRING(msg, NL80211_ATTR_REG_ALPHA2, alpha2); + NLA_PUT_U8(msg, NL80211_ATTR_DFS_REGION, country->creqs & 0x3); nl_reg_rules = nla_nest_start(msg, NL80211_ATTR_REG_RULES); if (!nl_reg_rules) { @@ -1109,6 +1109,10 @@ enum nl80211_commands { * %NL80211_CMD_TDLS_MGMT. Otherwise %NL80211_CMD_TDLS_OPER should be * used for asking the driver to perform a TDLS operation. * + * @NL80211_ATTR_DFS_REGION: region for regulatory rules which this country + * abides to when initiating radiation on DFS channels. A country maps + * to one DFS region. + * * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use */ @@ -1337,6 +1341,8 @@ enum nl80211_attrs { NL80211_ATTR_TDLS_SUPPORT, NL80211_ATTR_TDLS_EXTERNAL_SETUP, + NL80211_ATTR_DFS_REGION, + /* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST, @@ -1843,6 +1849,21 @@ enum nl80211_reg_rule_flags { }; /** + * enum nl80211_dfs_regions - regulatory DFS regions + * + * @NL80211_DFS_UNSET: Country has no DFS master region specified + * @NL80211_DFS_FCC_: Country follows DFS master rules from FCC + * @NL80211_DFS_FCC_: Country follows DFS master rules from ETSI + * @NL80211_DFS_JP_: Country follows DFS master rules from JP/MKK/Telec + */ +enum nl80211_dfs_regions { + NL80211_DFS_UNSET = 0, + NL80211_DFS_FCC = 1, + NL80211_DFS_ETSI = 2, + NL80211_DFS_JP = 3, +}; + +/** * enum nl80211_survey_info - survey information * * These attribute types are used with %NL80211_ATTR_SURVEY_INFO @@ -96,7 +96,8 @@ struct regdb_file_reg_rules_collection { struct regdb_file_reg_country { __u8 alpha2[2]; - __u8 PAD[2]; + __u8 PAD; + __u8 creqs; /* first two bits define DFS region */ /* pointer (offset) into the file to a struct * regdb_file_reg_rules_collection */ __be32 reg_collection_ptr; |