summaryrefslogtreecommitdiffstats
path: root/net/wireless/Kconfig
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/Kconfig
parentmac80211: only remove AP VLAN frames from TXQ (diff)
downloadlinux-007f6c5e6eb45c81ee89368a5f226572ae638831.tar.xz
linux-007f6c5e6eb45c81ee89368a5f226572ae638831.zip
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/Kconfig')
-rw-r--r--net/wireless/Kconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index 6c606120abfe..24eec5516649 100644
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -19,6 +19,7 @@ config WEXT_PRIV
config CFG80211
tristate "cfg80211 - wireless configuration API"
depends on RFKILL || !RFKILL
+ select FW_LOADER
---help---
cfg80211 is the Linux wireless LAN (802.11) configuration API.
Enable this if you have a wireless device.
@@ -167,7 +168,8 @@ config CFG80211_CRDA_SUPPORT
depends on CFG80211
help
You should enable this option unless you know for sure you have no
- need for it, for example when using internal regdb (above.)
+ need for it, for example when using internal regdb (above) or the
+ database loaded as a firmware file.
If unsure, say Y.