Revert "[wpa_supplicant] Cumulative patch from c4e90da6d"

This reverts commit 39bc25d3a79c1375de430a7918d949c1a86f70c6.

Test: Compilation
Change-Id: Iae7670429466958911b5296cb1359bceecc0b03e
Exempt-From-Owner-Approval: Revert since it's breaking the build
diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
index 85e63d3..28b3a1c 100644
--- a/src/ap/hostapd.h
+++ b/src/ap/hostapd.h
@@ -14,13 +14,6 @@
 #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;
@@ -331,6 +324,11 @@
 
 #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;