qcacld-3.0: Avoid CH_WIDTH_320MHZ dependency on 11BE define

CH_WIDTH_320MHZ definition is in 11BE define currently and it's
causing duplicate code in 11BE supported/unsupported cases.
Definition need not be in 11BE define as it doesn't cause any
impact on memory.

Change-Id: I9fa391474f513755000368cc2e41e004446353d0
CRs-Fixed: 3246578

components/cmn_services/policy_mgr/src/wlan_policy_mgr_core.c

@@ -2221,11 +2221,9 @@ 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)
 	case CH_WIDTH_320MHZ:
 		bw = HW_MODE_320_MHZ;
 		break;
-#endif
 	default:
 		policy_mgr_err("Unknown channel BW type %d", chan_width);
 		break;
@@ -2260,11 +2258,9 @@ 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)
 	case HW_MODE_320_MHZ:
 		ch_width = CH_WIDTH_320MHZ;
 		break;
-#endif
 	default:
 		policy_mgr_err("Invalid phy_ch_width type %d", ch_width);
 		break;

components/mlme/dispatcher/src/wlan_mlme_api.c

@@ -6013,36 +6013,14 @@ QDF_STATUS wlan_connect_hw_mode_change_resp(struct wlan_objmgr_pdev *pdev,
 						  status);
 }
 
-#ifdef WLAN_FEATURE_11BE
-static inline bool
-wlan_mlme_is_phymode_320_mhz(enum wlan_phymode phy_mode,
-			     enum phy_ch_width *ch_width)
-{
-	if (IS_WLAN_PHYMODE_320MHZ(phy_mode)) {
-		*ch_width = CH_WIDTH_320MHZ;
-		return true;
-	}
-
-	return false;
-}
-#else
-static inline bool
-wlan_mlme_is_phymode_320_mhz(enum wlan_phymode phy_mode,
-			     enum phy_ch_width *ch_width)
-{
-	return false;
-}
-#endif
-
 enum phy_ch_width
 wlan_mlme_get_ch_width_from_phymode(enum wlan_phymode phy_mode)
 {
-	enum phy_ch_width ch_width = CH_WIDTH_20MHZ;
-
-	if (wlan_mlme_is_phymode_320_mhz(phy_mode, &ch_width))
-		goto done;
+	enum phy_ch_width ch_width;
 
-	if (IS_WLAN_PHYMODE_160MHZ(phy_mode))
+	if (IS_WLAN_PHYMODE_320MHZ(phy_mode))
+		ch_width = CH_WIDTH_320MHZ;
+	else if (IS_WLAN_PHYMODE_160MHZ(phy_mode))
 		ch_width = CH_WIDTH_160MHZ;
 	else if (IS_WLAN_PHYMODE_80MHZ(phy_mode))
 		ch_width = CH_WIDTH_80MHZ;
@@ -6051,7 +6029,6 @@ wlan_mlme_get_ch_width_from_phymode(enum wlan_phymode phy_mode)
 	else
 		ch_width = CH_WIDTH_20MHZ;
 
-done:
 	mlme_legacy_debug("phymode: %d, ch_width: %d ", phy_mode, ch_width);
 
 	return ch_width;

core/hdd/src/wlan_hdd_assoc.c

@@ -2420,10 +2420,8 @@ hdd_convert_ch_width_to_cdp_peer_bw(enum phy_ch_width ch_width)
 		return CDP_5_MHZ;
 	case CH_WIDTH_10MHZ:
 		return CDP_10_MHZ;
-#ifdef WLAN_FEATURE_11BE
 	case CH_WIDTH_320MHZ:
 		return CDP_320_MHZ;
-#endif
 	default:
 		return CDP_BW_INVALID;
 	}

core/hdd/src/wlan_hdd_cfg80211.c

@@ -16289,14 +16289,12 @@ 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)
 #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/inc/sir_mac_prot_def.h

@@ -1028,9 +1028,7 @@ typedef enum eSirMacHTChannelWidth {
 	eHT_CHANNEL_WIDTH_80MHZ = 2,
 	eHT_CHANNEL_WIDTH_160MHZ = 3,
 	eHT_CHANNEL_WIDTH_80P80MHZ = 4,
-#ifdef WLAN_FEATURE_11BE
 	eHT_CHANNEL_WIDTH_320MHZ = 5,
-#endif
 	eHT_MAX_CHANNEL_WIDTH
 } tSirMacHTChannelWidth;
 

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

@@ -2984,10 +2984,8 @@ 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)
 	case CH_WIDTH_320MHZ:
 		return eHT_CHANNEL_WIDTH_320MHZ;
-#endif
 	case CH_WIDTH_MAX:
 		return eHT_MAX_CHANNEL_WIDTH;
 	case CH_WIDTH_5MHZ:

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

@@ -794,10 +794,8 @@ 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)
 	case CH_WIDTH_320MHZ:
 		return 320;
-#endif
 	default:
 		return 20;
 	}

core/sap/src/sap_fsm.c

@@ -1617,7 +1617,6 @@ static inline uint16_t he_mcs_12_13_support(void)
 }
 #endif
 
-#ifdef WLAN_FEATURE_11BE
 static bool is_mcs13_ch_width(enum phy_ch_width ch_width)
 {
 	if ((ch_width == CH_WIDTH_320MHZ) ||
@@ -1627,16 +1626,6 @@ static bool is_mcs13_ch_width(enum phy_ch_width ch_width)
 
 	return false;
 }
-#else
-static bool is_mcs13_ch_width(enum phy_ch_width ch_width)
-{
-	if ((ch_width == CH_WIDTH_160MHZ) ||
-	    (ch_width == CH_WIDTH_80P80MHZ))
-		return true;
-
-	return false;
-}
-#endif
 
 /**
  * sap_update_mcs_rate() - Update SAP MCS rate

core/wma/src/wma_scan_roam.c

@@ -116,10 +116,8 @@ 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)
 	case CH_WIDTH_320MHZ:
 		return WMI_HOST_CHAN_WIDTH_320;
-#endif
 	default:
 		return WMI_HOST_CHAN_WIDTH_20;
 	}