From: "Luis R. Rodriguez" <mcgrof@xxxxxxxxxxxxx> It has happened twice now where elaborate troubleshooting has undergone on systems where CONFIG_CFG80211_INTERNAL_REGDB [0] has been set but yet net/wireless/db.txt was not updated. Despite the documentation on this it seems system integrators could use some more help with this, so throw out a kernel warning at boot time when their database is empty. This does mean that the error-prone system integrator won't likely realize the issue until they boot the machine but -- it does not seem to make sense to enable a build bug breaking random build testing. [0] http://wireless.kernel.org/en/developers/Regulatory/CRDA#CONFIG_CFG80211_INTERNAL_REGDB Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Cc: Youngsin Lee <youngsin@xxxxxxxxxxxx> Cc: Raja Mani <rmani@xxxxxxxxxxxxxxxx> Cc: Senthil Kumar Balasubramanian <senthilb@xxxxxxxxxxxxxxxx> Cc: Vipin Mehta <vipimeht@xxxxxxxxxxxxxxxx> Cc: yahuan@xxxxxxxxxxxxxxxx Cc: jjan@xxxxxxxxxxxxxxxx Cc: vthiagar@xxxxxxxxxxxxxxxx Cc: henrykim@xxxxxxxxxxxx Cc: jouni@xxxxxxxxxxxxxxxx Cc: athiruve@xxxxxxxxxxxxxxxx Cc: cjkim@xxxxxxxxxxxx Cc: philipk@xxxxxxxxxxxxxxxx Cc: sunnykim@xxxxxxxxxxxx Cc: sskwak@xxxxxxxxxxxx Cc: kkim@xxxxxxxxxxxx Cc: mattbyun@xxxxxxxxxxxx Cc: ryanlee@xxxxxxxxxxxx Cc: simbap@xxxxxxxxxxxx Cc: krislee@xxxxxxxxxxxx Cc: conner@xxxxxxxxxxxx Cc: hojinkim@xxxxxxxxxxxx Cc: honglee@xxxxxxxxxxxx Cc: johnwkim@xxxxxxxxxxxx Cc: jinyong@xxxxxxxxxxxxxxxx Cc: stable@xxxxxxxxxxxxxxx Signed-off-by: Luis R. Rodriguez <mcgrof@xxxxxxxxxxxxx> --- This v4 Cc's stable. net/wireless/reg.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/net/wireless/reg.c b/net/wireless/reg.c index e9a0ac8..15f3474 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -388,7 +388,15 @@ static void reg_regdb_query(const char *alpha2) schedule_work(®_regdb_work); } + +/* Feel free to add any other sanity checks here */ +static void reg_regdb_size_check(void) +{ + /* We should ideally BUILD_BUG_ON() but then random builds would fail */ + WARN_ONCE(!reg_regdb_size, "db.txt is empty, you should update it..."); +} #else +static inline void reg_regdb_size_check(void) {} static inline void reg_regdb_query(const char *alpha2) {} #endif /* CONFIG_CFG80211_INTERNAL_REGDB */ @@ -2322,6 +2330,8 @@ int __init regulatory_init(void) spin_lock_init(®_requests_lock); spin_lock_init(®_pending_beacons_lock); + reg_regdb_size_check(); + cfg80211_regdomain = cfg80211_world_regdom; user_alpha2[0] = '9'; -- 1.7.10.rc1.22.gf5241 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
