Commit a7887236 authored by Romain Naour's avatar Romain Naour Committed by Johannes Berg

cfg80211: add missing dependency to CFG80211 suboptions

New options introduced by the patch this fixes are still
enabled even if CFG80211 is disabled.

.config:
    # CONFIG_CFG80211 is not set
    CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
    CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
    # CONFIG_LIB80211 is not set

When CFG80211_REQUIRE_SIGNED_REGDB is enabled, it selects
SYSTEM_DATA_VERIFICATION which selects SYSTEM_TRUSTED_KEYRING
that need extract-cert tool. extract-cert needs some openssl
headers to be installed on the build machine.

Instead of adding missing "depends on CFG80211", it's
easier to use a 'if' block around all options related
to CFG80211, so do that.

Fixes: 90a53e44 ("cfg80211: implement regdb signature checking")
Signed-off-by: default avatarRomain Naour <romain.naour@gmail.com>
[touch up commit message a bit]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent b323ac19
...@@ -34,9 +34,10 @@ config CFG80211 ...@@ -34,9 +34,10 @@ config CFG80211
When built as a module it will be called cfg80211. When built as a module it will be called cfg80211.
if CFG80211
config NL80211_TESTMODE config NL80211_TESTMODE
bool "nl80211 testmode command" bool "nl80211 testmode command"
depends on CFG80211
help help
The nl80211 testmode command helps implementing things like The nl80211 testmode command helps implementing things like
factory calibration or validation tools for wireless chips. factory calibration or validation tools for wireless chips.
...@@ -51,7 +52,6 @@ config NL80211_TESTMODE ...@@ -51,7 +52,6 @@ config NL80211_TESTMODE
config CFG80211_DEVELOPER_WARNINGS config CFG80211_DEVELOPER_WARNINGS
bool "enable developer warnings" bool "enable developer warnings"
depends on CFG80211
default n default n
help help
This option enables some additional warnings that help This option enables some additional warnings that help
...@@ -68,7 +68,7 @@ config CFG80211_DEVELOPER_WARNINGS ...@@ -68,7 +68,7 @@ config CFG80211_DEVELOPER_WARNINGS
config CFG80211_CERTIFICATION_ONUS config CFG80211_CERTIFICATION_ONUS
bool "cfg80211 certification onus" bool "cfg80211 certification onus"
depends on CFG80211 && EXPERT depends on EXPERT
default n default n
---help--- ---help---
You should disable this option unless you are both capable You should disable this option unless you are both capable
...@@ -159,7 +159,6 @@ config CFG80211_REG_RELAX_NO_IR ...@@ -159,7 +159,6 @@ config CFG80211_REG_RELAX_NO_IR
config CFG80211_DEFAULT_PS config CFG80211_DEFAULT_PS
bool "enable powersave by default" bool "enable powersave by default"
depends on CFG80211
default y default y
help help
This option enables powersave mode by default. This option enables powersave mode by default.
...@@ -170,7 +169,6 @@ config CFG80211_DEFAULT_PS ...@@ -170,7 +169,6 @@ config CFG80211_DEFAULT_PS
config CFG80211_DEBUGFS config CFG80211_DEBUGFS
bool "cfg80211 DebugFS entries" bool "cfg80211 DebugFS entries"
depends on CFG80211
depends on DEBUG_FS depends on DEBUG_FS
---help--- ---help---
You can enable this if you want debugfs entries for cfg80211. You can enable this if you want debugfs entries for cfg80211.
...@@ -180,7 +178,6 @@ config CFG80211_DEBUGFS ...@@ -180,7 +178,6 @@ config CFG80211_DEBUGFS
config CFG80211_CRDA_SUPPORT config CFG80211_CRDA_SUPPORT
bool "support CRDA" if EXPERT bool "support CRDA" if EXPERT
default y default y
depends on CFG80211
help help
You should enable this option unless you know for sure you have no You should enable this option unless you know for sure you have no
need for it, for example when using internal regdb (above) or the need for it, for example when using internal regdb (above) or the
...@@ -190,7 +187,6 @@ config CFG80211_CRDA_SUPPORT ...@@ -190,7 +187,6 @@ config CFG80211_CRDA_SUPPORT
config CFG80211_WEXT config CFG80211_WEXT
bool "cfg80211 wireless extensions compatibility" if !CFG80211_WEXT_EXPORT bool "cfg80211 wireless extensions compatibility" if !CFG80211_WEXT_EXPORT
depends on CFG80211
select WEXT_CORE select WEXT_CORE
default y if CFG80211_WEXT_EXPORT default y if CFG80211_WEXT_EXPORT
help help
...@@ -199,11 +195,12 @@ config CFG80211_WEXT ...@@ -199,11 +195,12 @@ config CFG80211_WEXT
config CFG80211_WEXT_EXPORT config CFG80211_WEXT_EXPORT
bool bool
depends on CFG80211
help help
Drivers should select this option if they require cfg80211's Drivers should select this option if they require cfg80211's
wext compatibility symbols to be exported. wext compatibility symbols to be exported.
endif # CFG80211
config LIB80211 config LIB80211
tristate tristate
default n default n
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment