|
@@ -14954,6 +14954,24 @@ sme_get_roam_scan_stats(mac_handle_t mac_handle,
|
|
|
return status;
|
|
|
}
|
|
|
|
|
|
+#ifdef WLAN_FEATURE_11BE
|
|
|
+static inline bool sme_is_phy_mode_11be(eCsrPhyMode phy_mode)
|
|
|
+{
|
|
|
+ if (phy_mode == eCSR_DOT11_MODE_AUTO ||
|
|
|
+ CSR_IS_DOT11_PHY_MODE_11BE(phy_mode) ||
|
|
|
+ CSR_IS_DOT11_PHY_MODE_11BE_ONLY(phy_mode)) {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+ return false;
|
|
|
+}
|
|
|
+#else
|
|
|
+static inline bool sme_is_phy_mode_11be(eCsrPhyMode phy_mode)
|
|
|
+{
|
|
|
+ return false;
|
|
|
+}
|
|
|
+#endif
|
|
|
+
|
|
|
void sme_update_score_config(mac_handle_t mac_handle, eCsrPhyMode phy_mode,
|
|
|
uint8_t num_rf_chains)
|
|
|
{
|
|
@@ -14971,15 +14989,13 @@ void sme_update_score_config(mac_handle_t mac_handle, eCsrPhyMode phy_mode,
|
|
|
|
|
|
config.vdev_nss_24g = vdev_ini_cfg.rx_nss[NSS_CHAINS_BAND_2GHZ];
|
|
|
config.vdev_nss_5g = vdev_ini_cfg.rx_nss[NSS_CHAINS_BAND_5GHZ];
|
|
|
-#ifdef WLAN_FEATURE_11BE
|
|
|
- if (phy_mode == eCSR_DOT11_MODE_AUTO ||
|
|
|
- CSR_IS_DOT11_PHY_MODE_11BE(phy_mode) ||
|
|
|
- CSR_IS_DOT11_PHY_MODE_11BE_ONLY(phy_mode)) {
|
|
|
+
|
|
|
+ if (sme_is_phy_mode_11be(phy_mode))
|
|
|
config.eht_cap = 1;
|
|
|
- config.he_cap = 1;
|
|
|
- }
|
|
|
-#endif
|
|
|
- if (phy_mode == eCSR_DOT11_MODE_11ax ||
|
|
|
+
|
|
|
+ if (config.eht_cap ||
|
|
|
+ phy_mode == eCSR_DOT11_MODE_AUTO ||
|
|
|
+ phy_mode == eCSR_DOT11_MODE_11ax ||
|
|
|
phy_mode == eCSR_DOT11_MODE_11ax_ONLY)
|
|
|
config.he_cap = 1;
|
|
|
|