qcacld-3.0: Fix 11be support compilation issue

Remove CFG80211_11BE_BASIC from modules that don't have
access to this macro.

Change-Id: Ib17dd50ae984e88af7b3a282b079265195247502
CRs-fixed: 3073652

components/cmn_services/policy_mgr/src/wlan_policy_mgr_core.c

@@ -1949,7 +1949,7 @@ enum hw_mode_bandwidth policy_mgr_get_bw(enum phy_ch_width chan_width)
 	case CH_WIDTH_10MHZ:
 		bw = HW_MODE_10_MHZ;
 		break;
-#if defined(WLAN_FEATURE_11BE) && defined(CFG80211_11BE_BASIC)
+#if defined(WLAN_FEATURE_11BE)
 	case CH_WIDTH_320MHZ:
 		bw = HW_MODE_320_MHZ;
 		break;
@@ -1988,7 +1988,7 @@ enum phy_ch_width policy_mgr_get_ch_width(enum hw_mode_bandwidth bw)
 	case HW_MODE_10_MHZ:
 		ch_width = CH_WIDTH_10MHZ;
 		break;
-#if defined(WLAN_FEATURE_11BE) && defined(CFG80211_11BE_BASIC)
+#if defined(WLAN_FEATURE_11BE)
 	case HW_MODE_320_MHZ:
 		ch_width = CH_WIDTH_320MHZ;
 		break;

components/umac/mlme/connection_mgr/core/src/wlan_cm_vdev_connect.c

@@ -433,7 +433,7 @@ static const uint8_t *cm_diag_get_akm_str(enum mgmt_auth_type auth_type,
 		return "NONE";
 }
 
-#if defined(WLAN_FEATURE_11BE) && defined(CFG80211_11BE_BASIC)
+#if defined(WLAN_FEATURE_11BE)
 static enum mgmt_dot11_mode
 cm_diag_eht_dot11_mode_from_phy_mode(enum wlan_phymode phymode)
 {

core/hdd/inc/wlan_hdd_eht.h

@@ -144,5 +144,10 @@ static inline void hdd_sysfs_11be_rate_create(struct hdd_adapter *adapter)
 static inline void hdd_sysfs_11be_rate_destroy(struct hdd_adapter *adapter)
 {
 }
+
+static inline void wlan_hdd_get_mlo_link_id(struct hdd_beacon_data *beacon,
+					    uint8_t *link_id, uint8_t *num_link)
+{
+}
 #endif
 #endif /* if !defined(WLAN_HDD_EHT_H)*/

core/hdd/src/wlan_hdd_cfg80211.c

@@ -15569,9 +15569,14 @@ hdd_convert_phy_bw_to_nl_bw(enum phy_ch_width bw)
 		return NL80211_CHAN_WIDTH_5;
 	case CH_WIDTH_10MHZ:
 		return NL80211_CHAN_WIDTH_10;
-#if defined(WLAN_FEATURE_11BE) && defined(CFG80211_11BE_BASIC)
+#if defined(WLAN_FEATURE_11BE)
+#if defined(CFG80211_11BE_BASIC)
 	case CH_WIDTH_320MHZ:
 		return NL80211_CHAN_WIDTH_320;
+#else
+	case CH_WIDTH_320MHZ:
+		return NL80211_CHAN_WIDTH_20;
+#endif
 #endif
 	case CH_WIDTH_INVALID:
 	case CH_WIDTH_MAX:

core/mac/src/pe/lim/lim_process_assoc_req_frame.c

@@ -2958,7 +2958,7 @@ lim_convert_channel_width_enum(enum phy_ch_width ch_width)
 		return eHT_CHANNEL_WIDTH_160MHZ;
 	case CH_WIDTH_80P80MHZ:
 		return eHT_CHANNEL_WIDTH_80P80MHZ;
-#if defined(WLAN_FEATURE_11BE) && defined(CFG80211_11BE_BASIC)
+#if defined(WLAN_FEATURE_11BE)
 	case CH_WIDTH_320MHZ:
 		return eHT_CHANNEL_WIDTH_320MHZ;
 #endif

core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -117,7 +117,7 @@ static const enum phy_ch_width get_next_higher_bw[] = {
 	[CH_WIDTH_20MHZ] = CH_WIDTH_40MHZ,
 	[CH_WIDTH_40MHZ] = CH_WIDTH_80MHZ,
 	[CH_WIDTH_80MHZ] = CH_WIDTH_160MHZ,
-#if !defined(WLAN_FEATURE_11BE) || !defined(CFG80211_11BE_BASIC)
+#if !defined(WLAN_FEATURE_11BE)
 	[CH_WIDTH_160MHZ] = CH_WIDTH_INVALID
 #else
 	[CH_WIDTH_160MHZ] = CH_WIDTH_320MHZ,

core/mac/src/pe/lim/lim_utils.h

@@ -759,7 +759,7 @@ static inline uint16_t ch_width_in_mhz(enum phy_ch_width ch_width)
 		return 5;
 	case CH_WIDTH_10MHZ:
 		return 10;
-#if defined(WLAN_FEATURE_11BE) && defined(CFG80211_11BE_BASIC)
+#if defined(WLAN_FEATURE_11BE)
 	case CH_WIDTH_320MHZ:
 		return 320;
 #endif

core/sap/src/sap_api_link_cntl.c

@@ -82,7 +82,7 @@
  * Function Declarations and Documentation
  * -------------------------------------------------------------------------*/
 
-#if defined(WLAN_FEATURE_11BE) && defined(CFG80211_11BE_BASIC)
+#if defined(WLAN_FEATURE_11BE)
 static inline bool sap_acs_cfg_is_chwidth_320mhz(uint16_t width)
 {
 	return width == CH_WIDTH_320MHZ;

core/sap/src/sap_ch_select.c

@@ -1826,7 +1826,7 @@ static void sap_sort_chl_weight_160_mhz(struct mac_context *mac_ctx,
 	}
 }
 
-#if defined(WLAN_FEATURE_11BE) && defined(CFG80211_11BE_BASIC)
+#if defined(WLAN_FEATURE_11BE)
 /**
  * sap_sort_chl_weight_320_mhz() - to sort the channels with the least weight
  * @pSpectInfoParams: Pointer to the tSapChSelSpectInfo structure
@@ -2418,7 +2418,7 @@ static void sap_sort_chl_weight_all(struct mac_context *mac_ctx,
 	case CH_WIDTH_160MHZ:
 		sap_sort_chl_weight_160_mhz(mac_ctx, pSpectInfoParams);
 		break;
-#if defined(WLAN_FEATURE_11BE) && defined(CFG80211_11BE_BASIC)
+#if defined(WLAN_FEATURE_11BE)
 	case CH_WIDTH_320MHZ:
 		sap_sort_chl_weight_320_mhz(mac_ctx, pSpectInfoParams);
 		break;

core/sap/src/sap_module.c

@@ -1195,7 +1195,7 @@ QDF_STATUS wlansap_deauth_sta(struct sap_context *sap_ctx,
 				   params);
 }
 
-#if defined(WLAN_FEATURE_11BE) && defined(CFG80211_11BE_BASIC)
+#if defined(WLAN_FEATURE_11BE)
 static enum phy_ch_width
 wlansap_get_target_eht_phy_ch_width(void)
 {

core/wma/src/wma_dev_if.c

@@ -3785,7 +3785,7 @@ QDF_STATUS wma_post_vdev_start_setup(uint8_t vdev_id)
 
 	wma_vdev_set_he_bss_params(wma, vdev_id,
 				   &mlme_obj->proto.he_ops_info);
-#if defined(WLAN_FEATURE_11BE) && defined(CFG80211_11BE_BASIC)
+#if defined(WLAN_FEATURE_11BE)
 	wma_vdev_set_eht_bss_params(wma, vdev_id,
 				    &mlme_obj->proto.eht_ops_info);
 #endif

core/wma/src/wma_eht.c

@@ -25,7 +25,7 @@
 #include "service_ready_param.h"
 #include "target_if.h"
 
-#if defined(WLAN_FEATURE_11BE) && defined(CFG80211_11BE_BASIC)
+#if defined(WLAN_FEATURE_11BE)
 /**
  * wma_convert_eht_cap() - convert EHT capabilities into dot11f structure
  * @eht_cap: pointer to dot11f structure

core/wma/src/wma_eht.h

@@ -19,7 +19,7 @@
 
 #include "wma.h"
 
-#if defined(WLAN_FEATURE_11BE) && defined(CFG80211_11BE_BASIC)
+#if defined(WLAN_FEATURE_11BE)
 /*
  * wma_eht_update_tgt_services() - update tgt cfg to indicate 11be support
  * @wmi_handle: pointer to WMI handle

core/wma/src/wma_features.c

@@ -636,7 +636,7 @@ QDF_STATUS wma_process_dhcp_ind(WMA_HANDLE handle,
 					    &peer_set_param_fp);
 }
 
-#if defined(WLAN_FEATURE_11BE) && defined(CFG80211_11BE_BASIC)
+#if defined(WLAN_FEATURE_11BE)
 static enum wlan_phymode
 wma_eht_chan_phy_mode(uint32_t freq, uint8_t dot11_mode, uint16_t bw_val,
 		      enum phy_ch_width chan_width)

core/wma/src/wma_scan_roam.c

@@ -115,7 +115,7 @@ wma_map_phy_ch_bw_to_wmi_channel_width(enum phy_ch_width ch_width)
 		return WMI_HOST_CHAN_WIDTH_5;
 	case CH_WIDTH_10MHZ:
 		return WMI_HOST_CHAN_WIDTH_10;
-#if defined(WLAN_FEATURE_11BE) && defined(CFG80211_11BE_BASIC)
+#if defined(WLAN_FEATURE_11BE)
 	case CH_WIDTH_320MHZ:
 		return WMI_HOST_CHAN_WIDTH_320;
 #endif
@@ -129,7 +129,7 @@ wma_map_phy_ch_bw_to_wmi_channel_width(enum phy_ch_width ch_width)
 #define WNI_CFG_VHT_CHANNEL_WIDTH_160MHZ        2
 #define WNI_CFG_VHT_CHANNEL_WIDTH_80_PLUS_80MHZ 3
 
-#if defined(WLAN_FEATURE_11BE) && defined(CFG80211_11BE_BASIC)
+#if defined(WLAN_FEATURE_11BE)
 static void wma_update_ch_list_11be_params(struct ch_params *ch)
 {
 	ch->ch_width = CH_WIDTH_320MHZ;

core/wma/src/wma_utils.c

@@ -3284,7 +3284,7 @@ wma_peer_phymode(tSirNwType nw_type, uint8_t sta_type,
 			phymode = WLAN_PHYMODE_11A;
 			break;
 		}
-#if defined(WLAN_FEATURE_11BE) && defined(CFG80211_11BE_BASIC)
+#if defined(WLAN_FEATURE_11BE)
 		if (is_eht) {
 			if (ch_width == CH_WIDTH_160MHZ)
 				phymode = WLAN_PHYMODE_11BEA_EHT160;