qcacld-2.0: Fix set 2G MGMT rate fail issue
2G rate failed to be sent to FW while 5G rate can be sent to FW
successfully.
Root cause is 2G rate failed the rate validation due to wrong band
input. Change input to wma_verify_rate_code from current band to
per band as MGMT rate is per band configuration.
Change-Id: Ia0ec7e030afa88b26df6e76524ef5396b1e6ede6
CRs-Fixed: 2184639
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c
index 4934144..c870f02 100644
--- a/CORE/SERVICES/WMA/wma.c
+++ b/CORE/SERVICES/WMA/wma.c
@@ -10382,11 +10382,11 @@
/**
* wma_verify_rate_code() - verify if rate code is valid.
* @rate_code: rate code
- * @curr_band: current band that device working on
+ * @band: band information
*
* Return: verify result
*/
-static bool wma_verify_rate_code(u_int32_t rate_code, uint8_t curr_band)
+static bool wma_verify_rate_code(u_int32_t rate_code, uint8_t band)
{
uint8_t preamble, nss, rate;
bool valid = true;
@@ -10397,7 +10397,7 @@
switch (preamble) {
case WMI_RATE_PREAMBLE_CCK:
- if (nss != 0 || rate > 3 || curr_band == VOS_BAND_5GHZ)
+ if (nss != 0 || rate > 3 || band == VOS_BAND_5GHZ)
valid = false;
break;
case WMI_RATE_PREAMBLE_OFDM:
@@ -10435,8 +10435,7 @@
uint32_t cfg_val;
int ret;
uint32_t per_band_mgmt_tx_rate = 0;
- uint32_t current_chan;
- uint8_t current_band;
+ uint8_t band = 0;
struct sAniSirGlobal *mac =
(struct sAniSirGlobal*)vos_get_context(VOS_MODULE_ID_PE,
wma->vos_context);
@@ -10446,13 +10445,11 @@
return;
}
- current_chan = vos_freq_to_chan(wma->interfaces[vdev_id].mhz);
- current_band = vos_chan_to_band(current_chan);
-
if (wlan_cfgGetInt(mac, WNI_CFG_RATE_FOR_TX_MGMT,
&cfg_val) == eSIR_SUCCESS) {
+ band = 0;
if ((cfg_val == WNI_CFG_RATE_FOR_TX_MGMT_STADEF) ||
- !wma_verify_rate_code(cfg_val, current_band)) {
+ !wma_verify_rate_code(cfg_val, band)) {
WMA_LOGE("invalid rate code, ignore.");
} else {
ret = wmi_unified_vdev_set_param_send(
@@ -10471,8 +10468,10 @@
if (wlan_cfgGetInt(mac, WNI_CFG_RATE_FOR_TX_MGMT_2G,
&cfg_val) == eSIR_SUCCESS) {
+ band = VOS_BAND_2GHZ;
if ((cfg_val == WNI_CFG_RATE_FOR_TX_MGMT_2G_STADEF) ||
- !wma_verify_rate_code(cfg_val, current_band)) {
+ !wma_verify_rate_code(cfg_val, band)) {
+ WMA_LOGD("use default 2G MGMT rate.");
per_band_mgmt_tx_rate &=
~(1 << TX_MGMT_RATE_2G_ENABLE_OFFSET);
} else {
@@ -10487,8 +10486,10 @@
if (wlan_cfgGetInt(mac, WNI_CFG_RATE_FOR_TX_MGMT_5G,
&cfg_val) == eSIR_SUCCESS) {
+ band = VOS_BAND_5GHZ;
if ((cfg_val == WNI_CFG_RATE_FOR_TX_MGMT_5G_STADEF) ||
- !wma_verify_rate_code(cfg_val, current_band)) {
+ !wma_verify_rate_code(cfg_val, band)) {
+ WMA_LOGD("use default 5G MGMT rate.");
per_band_mgmt_tx_rate &=
~(1 << TX_MGMT_RATE_5G_ENABLE_OFFSET);
} else {
