diff options
| author | Janusz Dziedzic | 2014-02-21 19:46:12 +0100 |
|---|---|---|
| committer | Johannes Berg | 2014-02-25 17:29:25 +0100 |
| commit | 089027e57cfa79337feffdd7252c8ba0be352afa (patch) | |
| tree | 076b28e399d4ae3eca61a5e1dea50057e1ebb1c0 /net/wireless/genregdb.awk | |
| parent | cfg80211: regulatory: allow user to set world regdomain (diff) | |
| download | kernel-qcow2-linux-089027e57cfa79337feffdd7252c8ba0be352afa.tar.gz kernel-qcow2-linux-089027e57cfa79337feffdd7252c8ba0be352afa.tar.xz kernel-qcow2-linux-089027e57cfa79337feffdd7252c8ba0be352afa.zip | |
cfg80211: regulatory: allow getting DFS CAC time from userspace
Introduce DFS CAC time as a regd param, configured per REG_RULE and
set per channel in cfg80211. DFS CAC time is close connected with
regulatory database configuration. Instead of using hardcoded values,
get DFS CAC time form regulatory database. Pass DFS CAC time to user
mode (mainly for iw reg get, iw list, iw info). Allow setting DFS CAC
time via CRDA. Add support for internal regulatory database.
Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
[rewrap commit log]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/genregdb.awk')
| -rw-r--r-- | net/wireless/genregdb.awk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/wireless/genregdb.awk b/net/wireless/genregdb.awk index fdfd3f063a9b..b35da8dc85de 100644 --- a/net/wireless/genregdb.awk +++ b/net/wireless/genregdb.awk @@ -66,6 +66,7 @@ function parse_reg_rule() units = $8 sub(/\)/, "", units) sub(/,/, "", units) + dfs_cac = $9 if (units == "mW") { if (power == 100) { power = 20 @@ -78,7 +79,12 @@ function parse_reg_rule() } else { print "Unknown power value in database!" } + } else { + dfs_cac = $8 } + sub(/,/, "", dfs_cac) + sub(/\(/, "", dfs_cac) + sub(/\)/, "", dfs_cac) flagstr = "" for (i=8; i<=NF; i++) flagstr = flagstr $i @@ -111,7 +117,7 @@ function parse_reg_rule() } flags = flags "0" - printf "\t\tREG_RULE(%d, %d, %d, %d, %d, %s),\n", start, end, bw, gain, power, flags + printf "\t\tREG_RULE_EXT(%d, %d, %d, %d, %d, %d, %s),\n", start, end, bw, gain, power, dfs_cac, flags rules++ } |