diff options
author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-06-13 21:29:37 +0200 |
---|---|---|
committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-06-13 21:29:37 +0200 |
commit | 6303791f24e88b81b858fbacd26523ac4af8ef83 (patch) | |
tree | d75a11331a3b775d7db7e281c909b610fb9e03f6 /net/wireless | |
parent | e5cf67e56e4f4e7dc90ea645f011d35ad5f7a271 (diff) | |
parent | 26a7895e70104811258cf023d06a21f92ab590c6 (diff) | |
download | kernel_samsung_crespo-6303791f24e88b81b858fbacd26523ac4af8ef83.zip kernel_samsung_crespo-6303791f24e88b81b858fbacd26523ac4af8ef83.tar.gz kernel_samsung_crespo-6303791f24e88b81b858fbacd26523ac4af8ef83.tar.bz2 |
Merge branch 'linux-3.0.y' into HEAD
Diffstat (limited to 'net/wireless')
-rw-r--r-- | net/wireless/reg.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 72f7fee..9bcb6bc 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -379,7 +379,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 */ @@ -2228,6 +2236,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'; |