aboutsummaryrefslogtreecommitdiffstats
path: root/src/ap/hostapd.h
diff options
context:
space:
mode:
authorAnkita Bajaj <bankita@codeaurora.org>2018-10-16 14:32:19 (GMT)
committerJouni Malinen <j@w1.fi>2018-10-30 13:43:01 (GMT)
commit0f0aa2a640ff1a1037c7f3323009bb1d12e7a6cd (patch)
tree3a1e8dccbd9d8a91e8eb0e79a35af874ed3a7fd3 /src/ap/hostapd.h
parent1695b4dc371dbaa1ac6c40700f5f56e9eeeb1a6c (diff)
downloadhostap-0f0aa2a640ff1a1037c7f3323009bb1d12e7a6cd.zip
hostap-0f0aa2a640ff1a1037c7f3323009bb1d12e7a6cd.tar.gz
hostap-0f0aa2a640ff1a1037c7f3323009bb1d12e7a6cd.tar.bz2
OCE: Move OCE checks to IE formation from hostapd initialization
Earlier, the OCE flags were checked during hostapd initialization. This doesn't address few cases like for example when the interface is added from control interface. Move the OCE flag checks to the functions that are forming the MBO/OCE IEs to cover all the different paths for enabling a BSS. Also use macros as appropriate for readability. Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
Diffstat (limited to 'src/ap/hostapd.h')
-rw-r--r--src/ap/hostapd.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
index 9a520f3..d304c11 100644
--- a/src/ap/hostapd.h
+++ b/src/ap/hostapd.h
@@ -14,6 +14,13 @@
#include "ap_config.h"
#include "drivers/driver.h"
+#define OCE_STA_CFON_ENABLED(hapd) \
+ ((hapd->conf->oce & OCE_STA_CFON) && \
+ (hapd->iface->drv_flags & WPA_DRIVER_FLAGS_OCE_STA_CFON))
+#define OCE_AP_ENABLED(hapd) \
+ ((hapd->conf->oce & OCE_AP) && \
+ (hapd->iface->drv_flags & WPA_DRIVER_FLAGS_OCE_AP))
+
struct wpa_ctrl_dst;
struct radius_server_data;
struct upnp_wps_device_sm;
@@ -324,11 +331,6 @@ struct hostapd_data {
#ifdef CONFIG_MBO
unsigned int mbo_assoc_disallow;
- /**
- * enable_oce - Enable OCE if it is enabled by user and device also
- * supports OCE.
- */
- u8 enable_oce;
#endif /* CONFIG_MBO */
struct dl_list nr_db;