From aebb8edd0edf042a77af236a0931cdb0a4a993dc Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Fri, 23 Mar 2012 07:23:31 -0700 Subject: [PATCH] --- yaml --- r: 300637 b: refs/heads/master c: 80007efeff0568375b08faf93c7aad65602cb97e h: refs/heads/master i: 300635: beaeb873f5147295bc94701778a9fbbd1949a59a v: v3 --- [refs] | 2 +- trunk/net/wireless/reg.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 752b031273b7..21e022b47d4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2a079fd48c05235b86016a33a79cb86a86e15a8 +refs/heads/master: 80007efeff0568375b08faf93c7aad65602cb97e diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c index e9a0ac83b84c..15f347477a99 100644 --- a/trunk/net/wireless/reg.c +++ b/trunk/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';