Skip to content

Commit d909634

Browse files
krish2718kartben
authored andcommitted
modules: hostap: Fix advanced features disable
Zephyr introduced postive feature flags to make advanced features conditional but the upstream has followed a negative feature flag for advanced features, and during upmerge these two weren't reconciled. Fix the build in case advanced features are disabled. Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
1 parent 0953ea0 commit d909634

File tree

2 files changed

+9
-17
lines changed

2 files changed

+9
-17
lines changed

modules/hostap/CMakeLists.txt

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,16 @@ zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_NO_DEBUG
5858
CONFIG_NO_STDOUT_DEBUG
5959
)
6060
61-
zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_ROBUST_AV
62-
CONFIG_ROBUST_AV
61+
zephyr_library_compile_definitions_ifndef(CONFIG_WIFI_NM_WPA_SUPPLICANT_ROBUST_AV
62+
CONFIG_NO_ROBUST_AV
6363
)
6464
65-
zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_WMM_AC
66-
CONFIG_WMM_AC
65+
zephyr_library_compile_definitions_ifndef(CONFIG_WIFI_NM_WPA_SUPPLICANT_WMM_AC
66+
CONFIG_NO_WMM_AC
6767
)
6868
69-
zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_RRM
70-
CONFIG_RRM
71-
)
72-
73-
zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_ROBUST_AV
74-
CONFIG_ROBUST_AV
69+
zephyr_library_compile_definitions_ifndef(CONFIG_WIFI_NM_WPA_SUPPLICANT_RRM
70+
CONFIG_NO_RRM
7571
)
7672
7773
zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_MBO

modules/hostap/Kconfig

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -516,17 +516,13 @@ config WPA_CRYPTO
516516
config WPA_SUPP_CRYPTO
517517
bool
518518

519-
config ROBUST_AV
519+
config NO_ROBUST_AV
520520
bool
521-
default y
522-
depends on WIFI_NM_WPA_SUPPLICANT_ROBUST_AV
523521

524-
config RRM
522+
config NO_RRM
525523
bool
526-
default y
527-
depends on WIFI_NM_WPA_SUPPLICANT_RRM
528524

529-
config WMM_AC
525+
config NO_WMM_AC
530526
bool
531527

532528
config DPP

0 commit comments

Comments
 (0)