diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-03-20 15:53:20 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-03-20 15:53:20 (GMT) |
commit | 7eb2450a51ea7606fa69ae4bb2113e0f228223cc (patch) | |
tree | 6cd273487574edd2da40ce14b1981e14a5171caa /net/wireless/genregdb.awk | |
parent | 474a41e94dfc85167e1761bfbb8bf180f90633b2 (diff) | |
parent | 73fb08e24ae840bc518facc2c605dd6bb3751fec (diff) | |
download | linux-7eb2450a51ea7606fa69ae4bb2113e0f228223cc.tar.xz |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
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 fdfd3f0..b35da8d 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++ } |