From: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Date: Mon, 28 Oct 2013 02:19:46 +0000 (+0100)
Subject: cfg80211: fix parsing when db.txt ends on a rule
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~10975^2~334^2^2~139
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ae689390b09d1f5b274c83dbbd3836fedb692e31;p=mirror_ubuntu-artful-kernel.git

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 <mcgrof@do-not-panic.com>
Acked-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/wireless/genregdb.awk b/net/wireless/genregdb.awk
index 42cd3fd2aa14..9a8217d2a908 100644
--- a/net/wireless/genregdb.awk
+++ b/net/wireless/genregdb.awk
@@ -143,6 +143,8 @@ active && /^[ \t]*$/ {
 }
 
 END {
+	if (active)
+		print_tail_country()
 	print regdb "};"
 	print ""
 	print "int reg_regdb_size = ARRAY_SIZE(reg_regdb);"