qcacmn: EHT changes as per latest fw cmn headers

Updated the EHT related variables as per latest fw cmn headers.
Address review comments from previous EHT gerrits.

Change-Id: I67cd58a4efcf3e06d2ca3b5570432593b1d80825
CRs-Fixed: 2902607

umac/scan/dispatcher/inc/wlan_scan_utils_api.h

@@ -730,6 +730,7 @@ util_scan_copy_beacon_data(struct scan_cache_entry *new_entry,
 	ie_lst->single_pmk = conv_ptr(ie_lst->single_pmk, old_ptr, new_ptr);
 	ie_lst->rsnxe = conv_ptr(ie_lst->rsnxe, old_ptr, new_ptr);
 #ifdef WLAN_FEATURE_11BE
+	/* This macro will be removed once 11be is enabled */
 	ie_lst->ehtcap = conv_ptr(ie_lst->ehtcap, old_ptr, new_ptr);
 	ie_lst->ehtop = conv_ptr(ie_lst->ehtop, old_ptr, new_ptr);
 #endif

umac/scan/dispatcher/src/wlan_scan_utils_api.c

@@ -186,10 +186,10 @@ static bool util_is_pureg_rate(uint8_t *rates, uint8_t nrates)
 
 #ifdef WLAN_FEATURE_11BE
 static enum wlan_phymode
-util_scan_get_phymode_5g_11be(struct wlan_objmgr_pdev *pdev,
-			      struct scan_cache_entry *scan_params,
-			      enum wlan_phymode phymode,
-			      uint8_t band_mask)
+util_scan_get_phymode_11be(struct wlan_objmgr_pdev *pdev,
+			   struct scan_cache_entry *scan_params,
+			   enum wlan_phymode phymode,
+			   uint8_t band_mask)
 {
 	struct wlan_ie_ehtops *eht_ops;
 
@@ -231,10 +231,10 @@ util_scan_get_phymode_5g_11be(struct wlan_objmgr_pdev *pdev,
 }
 #else
 static enum wlan_phymode
-util_scan_get_phymode_5g_11be(struct wlan_objmgr_pdev *pdev,
-			      struct scan_cache_entry *scan_params,
-			      enum wlan_phymode phymode,
-			      uint8_t band_mask)
+util_scan_get_phymode_11be(struct wlan_objmgr_pdev *pdev,
+			   struct scan_cache_entry *scan_params,
+			   enum wlan_phymode phymode,
+			   uint8_t band_mask)
 {
 	return phymode;
 }
@@ -392,8 +392,8 @@ util_scan_get_phymode_6g(struct wlan_objmgr_pdev *pdev,
 					he_6g_params->chan_freq_seg1,
 					band_mask);
 
-	phymode = util_scan_get_phymode_5g_11be(pdev, scan_params,
-						phymode, band_mask);
+	phymode = util_scan_get_phymode_11be(pdev, scan_params,
+					     phymode, band_mask);
 
 	return phymode;
 }
@@ -528,8 +528,8 @@ util_scan_get_phymode_5g(struct wlan_objmgr_pdev *pdev,
 		break;
 	}
 
-	phymode = util_scan_get_phymode_5g_11be(pdev, scan_params,
-						phymode, band_mask);
+	phymode = util_scan_get_phymode_11be(pdev, scan_params,
+					     phymode, band_mask);
 
 	return phymode;
 }