diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-06-02 11:20:17 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-06-02 11:20:17 -0400 |
commit | fcb2c0d6cf75750e2912b09a3d0a782c90e2b1a0 (patch) | |
tree | a17982638b066ae29f8ab1a6e37f18e6dddb5272 /net/wireless/genregdb.awk | |
parent | 96b2e73c5471542cb9c622c4360716684f8797ed (diff) | |
parent | a715c7ddd65a1a3b2839b8ebd759bb2d361f7675 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/wireless/genregdb.awk')
-rw-r--r-- | net/wireless/genregdb.awk | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/net/wireless/genregdb.awk b/net/wireless/genregdb.awk index b35da8dc85d..40c37fc5b67 100644 --- a/net/wireless/genregdb.awk +++ b/net/wireless/genregdb.awk @@ -68,17 +68,7 @@ function parse_reg_rule() sub(/,/, "", units) dfs_cac = $9 if (units == "mW") { - if (power == 100) { - power = 20 - } else if (power == 200) { - power = 23 - } else if (power == 500) { - power = 27 - } else if (power == 1000) { - power = 30 - } else { - print "Unknown power value in database!" - } + power = 10 * log(power)/log(10) } else { dfs_cac = $8 } @@ -117,7 +107,7 @@ function parse_reg_rule() } flags = flags "0" - printf "\t\tREG_RULE_EXT(%d, %d, %d, %d, %d, %d, %s),\n", start, end, bw, gain, power, dfs_cac, flags + printf "\t\tREG_RULE_EXT(%d, %d, %d, %d, %.0f, %d, %s),\n", start, end, bw, gain, power, dfs_cac, flags rules++ } |