2013-10-28 02:19:51

by Luis Chamberlain

Subject: [PATCH 0/2] cfg80211: a few genregdb.awk updates

A few updates while toying with genregdb.awk for small
regulatory domains. This depends on the antenna gain removal
patch.

Luis R. Rodriguez (2):
cfg80211: add function helpers to genregdb.awk
cfg80211: fix parsing when db.txt ends on a rule

net/wireless/genregdb.awk | 38 +++++++++++++++++++++++++++-----------
1 file changed, 27 insertions(+), 11 deletions(-)

--
1.8.4.rc3

2013-10-28 02:19:55

by Luis Chamberlain

Subject: [PATCH 2/2] cfg80211: fix parsing when db.txt ends on a rule

If genregdb.awk assumes the file will end with an
extra empty line or a comment line. This is could
not be true so just address this.

Signed-off-by: Luis R. Rodriguez <[email protected]>
---
net/wireless/genregdb.awk | 2 ++
1 file changed, 2 insertions(+)

diff --git a/net/wireless/genregdb.awk b/net/wireless/genregdb.awk
index 95baf61..13b982d 100755
--- a/net/wireless/genregdb.awk
+++ b/net/wireless/genregdb.awk
@@ -140,6 +140,8 @@ active && /^[ \t]*$/ {
}

END {
+ if (active)
+ print_tail_country()
print regdb "};"
print ""
print "int reg_regdb_size = ARRAY_SIZE(reg_regdb);"
--
1.8.4.rc3

2013-10-28 02:19:54

by Luis Chamberlain

Subject: [PATCH 1/2] cfg80211: add function helpers to genregdb.awk

This has no functional change, this just lets us reuse
helpers at a later time.

Cc: John W. Linville <[email protected]>
Signed-off-by: Luis R. Rodriguez <[email protected]>
---
net/wireless/genregdb.awk | 36 +++++++++++++++++++++++++-----------
1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/net/wireless/genregdb.awk b/net/wireless/genregdb.awk
index 3e241e4e..95baf61 100755
--- a/net/wireless/genregdb.awk
+++ b/net/wireless/genregdb.awk
@@ -33,15 +33,7 @@ BEGIN {
regdb = "const struct ieee80211_regdomain *reg_regdb[] = {\n"
}

-/^[ \t]*#/ {
- # Ignore
-}
-
-!active && /^[ \t]*$/ {
- # Ignore
-}
-
-!active && /country/ {
+function parse_country_head() {
country=$2
sub(/:/, "", country)
printf "static const struct ieee80211_regdomain regdom_%s = {\n", country
@@ -57,7 +49,8 @@ BEGIN {
regdb = regdb "\t&regdom_" country ",\n"
}

-active && /^[ \t]*\(/ {
+function parse_reg_rule()
+{
start = $1
sub(/\(/, "", start)
end = $3
@@ -117,7 +110,8 @@ active && /^[ \t]*\(/ {
rules++
}

-active && /^[ \t]*$/ {
+function print_tail_country()
+{
active = 0
printf "\t},\n"
printf "\t.n_reg_rules = %d\n", rules
@@ -125,6 +119,26 @@ active && /^[ \t]*$/ {
rules = 0;
}

+/^[ \t]*#/ {
+ # Ignore
+}
+
+!active && /^[ \t]*$/ {
+ # Ignore
+}
+
+!active && /country/ {
+ parse_country_head()
+}
+
+active && /^[ \t]*\(/ {
+ parse_reg_rule()
+}
+
+active && /^[ \t]*$/ {
+ print_tail_country()
+}
+
END {
print regdb "};"
print ""
--
1.8.4.rc3

2013-10-28 13:59:01

by Johannes Berg

Subject: Re: [PATCH 0/2] cfg80211: a few genregdb.awk updates

I'd apply this, but would prefer John to take a look - he wrote the awk
script and I'm not familiar with it.

johannes

2013-11-11 14:12:19

by Johannes Berg

Subject: Re: [PATCH 0/2] cfg80211: a few genregdb.awk updates

On Mon, 2013-10-28 at 03:19 +0100, Luis R. Rodriguez wrote:
> A few updates while toying with genregdb.awk for small
> regulatory domains. This depends on the antenna gain removal
> patch.

Applied, thanks.

johannes

2013-11-07 19:00:10

by John W. Linville

Subject: Re: [PATCH 0/2] cfg80211: a few genregdb.awk updates

On Mon, Oct 28, 2013 at 02:58:55PM +0100, Johannes Berg wrote:
> I'd apply this, but would prefer John to take a look - he wrote the awk
> script and I'm not familiar with it.

They seem OK to me.

Acked-by: John W. Linville <[email protected]>

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.