summaryrefslogtreecommitdiffstats
path: root/net/wireless/core.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2015-10-15 11:22:58 +0200
committerJohannes Berg <johannes.berg@intel.com>2017-10-11 13:04:15 +0200
commit007f6c5e6eb45c81ee89368a5f226572ae638831 (patch)
treef458dd8f271a09f88f0cc98dbea8f89d6f6f60dc /net/wireless/core.c
parent2a9e25796b289f71c0802eca46005c750c57af95 (diff)
downloadop-kernel-dev-007f6c5e6eb45c81ee89368a5f226572ae638831.zip
op-kernel-dev-007f6c5e6eb45c81ee89368a5f226572ae638831.tar.gz
cfg80211: support loading regulatory database as firmware file
As the current regulatory database is only about 4k big, and already difficult to extend, we decided that overall it would be better to get rid of the complications with CRDA and load the database into the kernel directly, but in a new format that is extensible. The new file format can be extended since it carries a length field on all the structs that need to be extensible. In order to be able to request firmware when the module initializes, move cfg80211 from subsys_initcall() to the later fs_initcall(); the firmware loader is at the same level but linked earlier, so it can be called from there. Otherwise, when both the firmware loader and cfg80211 are built-in, the request will crash the kernel. We also need to be before device_initcall() so that cfg80211 is available for devices when they initialize. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/core.c')
-rw-r--r--net/wireless/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 7b33e8c..fdde0d9 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -1384,7 +1384,7 @@ out_fail_sysfs:
out_fail_pernet:
return err;
}
-subsys_initcall(cfg80211_init);
+fs_initcall(cfg80211_init);
static void __exit cfg80211_exit(void)
{
OpenPOWER on IntegriCloud