mac80211: skip antenna gain when compiling regdb.txt (#15397)
The antenna gain attribute has been removed from the upstream regulatory database. Incorperate patch from Luis R. Rodriguez to skip the parsing of the gain attribute in genregdb.awk in order to emit proper rules again. Also refresh fuzzy patches while we're at it. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 40296master
parent
95a14e1dcd
commit
f5fce5e0da
@ -0,0 +1,44 @@ |
||||
From: Luis R. Rodriguez <mcgrof@do-not-panic.com>
|
||||
Date: Wed, 23 Oct 2013 14:55:36 -0400
|
||||
Subject: [RFC] cfg80211: make genregdb.awk skip antenna gain
|
||||
|
||||
Now that wireless-regdb doesn't include
|
||||
antenna gain lets skip parsing it completely
|
||||
for when CONFIG_CFG80211_INTERNAL_REGDB is
|
||||
enabled.
|
||||
|
||||
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
|
||||
---
|
||||
net/wireless/genregdb.awk | 11 ++++-------
|
||||
1 file changed, 4 insertions(+), 7 deletions(-)
|
||||
mode change 100644 => 100755 net/wireless/genregdb.awk
|
||||
|
||||
--- a/net/wireless/genregdb.awk
|
||||
+++ b/net/wireless/genregdb.awk
|
||||
@@ -56,14 +56,11 @@ function parse_reg_rule()
|
||||
end = $3
|
||||
bw = $5
|
||||
sub(/\),/, "", bw)
|
||||
- gain = $6
|
||||
- sub(/\(/, "", gain)
|
||||
- sub(/,/, "", gain)
|
||||
- power = $7
|
||||
- sub(/\)/, "", power)
|
||||
+ power = $6
|
||||
+ sub(/\(/, "", power)
|
||||
sub(/,/, "", power)
|
||||
# power might be in mW...
|
||||
- units = $8
|
||||
+ units = $7
|
||||
sub(/\)/, "", units)
|
||||
sub(/,/, "", units)
|
||||
if (units == "mW") {
|
||||
@@ -80,7 +77,7 @@ function parse_reg_rule()
|
||||
}
|
||||
}
|
||||
flagstr = ""
|
||||
- for (i=8; i<=NF; i++)
|
||||
+ for (i=7; i<=NF; i++)
|
||||
flagstr = flagstr $i
|
||||
split(flagstr, flagarray, ",")
|
||||
flags = ""
|
Loading…
Reference in new issue