|
@@ -1410,6 +1410,8 @@ QDF_STATUS csr_update_channel_list(struct mac_context *mac)
|
|
|
uint32_t channel_freq;
|
|
|
bool is_unsafe_chan;
|
|
|
bool is_same_band;
|
|
|
+ bool is_5mhz_enabled;
|
|
|
+ bool is_10mhz_enabled;
|
|
|
enum scm_scan_status scan_status;
|
|
|
QDF_STATUS lock_status;
|
|
|
|
|
@@ -1451,6 +1453,13 @@ QDF_STATUS csr_update_channel_list(struct mac_context *mac)
|
|
|
if (!pChanList)
|
|
|
return QDF_STATUS_E_NOMEM;
|
|
|
|
|
|
+ is_5mhz_enabled = cds_is_5_mhz_enabled();
|
|
|
+ if (is_5mhz_enabled)
|
|
|
+ sme_nofl_debug("quarter_rate enabled");
|
|
|
+ is_10mhz_enabled = cds_is_10_mhz_enabled();
|
|
|
+ if (is_10mhz_enabled)
|
|
|
+ sme_nofl_debug("half_rate enabled");
|
|
|
+
|
|
|
for (i = 0; i < pScan->base_channels.numChannels; i++) {
|
|
|
struct csr_sta_roam_policy_params *roam_policy =
|
|
|
&mac->roam.configParam.sta_roam_policy;
|
|
@@ -1539,18 +1548,13 @@ QDF_STATUS csr_update_channel_list(struct mac_context *mac)
|
|
|
else
|
|
|
pChanList->chanParam[num_channel].dfsSet =
|
|
|
true;
|
|
|
- if (cds_is_5_mhz_enabled())
|
|
|
- pChanList->chanParam[num_channel].quarter_rate
|
|
|
- = 1;
|
|
|
- else if (cds_is_10_mhz_enabled())
|
|
|
- pChanList->chanParam[num_channel].half_rate = 1;
|
|
|
- QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
|
|
|
- "Freq:%d, pwr=%d, DFS=%d qrate %d hrate %d ",
|
|
|
- pChanList->chanParam[num_channel].freq,
|
|
|
- pChanList->chanParam[num_channel].pwr,
|
|
|
- pChanList->chanParam[num_channel].dfsSet,
|
|
|
- pChanList->chanParam[num_channel].quarter_rate,
|
|
|
- pChanList->chanParam[num_channel].half_rate);
|
|
|
+
|
|
|
+ pChanList->chanParam[num_channel].quarter_rate =
|
|
|
+ is_5mhz_enabled;
|
|
|
+
|
|
|
+ pChanList->chanParam[num_channel].half_rate =
|
|
|
+ is_10mhz_enabled;
|
|
|
+
|
|
|
num_channel++;
|
|
|
}
|
|
|
}
|
|
@@ -20372,15 +20376,13 @@ csr_update_op_class_array(struct mac_context *mac_ctx,
|
|
|
uint8_t num_channels = channel_info->numChannels;
|
|
|
uint8_t ch_num;
|
|
|
|
|
|
- sme_debug("Num of %s channels, %d", ch_name, num_channels);
|
|
|
+ sme_debug("Num %s channels, %d", ch_name, num_channels);
|
|
|
|
|
|
for (idx = 0; idx < num_channels &&
|
|
|
*i < (REG_MAX_SUPP_OPER_CLASSES - 1); idx++) {
|
|
|
wlan_reg_freq_to_chan_op_class(
|
|
|
mac_ctx->pdev, channel_info->channel_freq_list[idx],
|
|
|
false, BIT(BEHAV_NONE), &class, &ch_num);
|
|
|
- sme_debug("for chan freq %d, op class: %d",
|
|
|
- channel_info->channel_freq_list[idx], class);
|
|
|
|
|
|
found = false;
|
|
|
for (j = 0; j < REG_MAX_SUPP_OPER_CLASSES - 1; j++) {
|
|
@@ -20433,11 +20435,6 @@ static void csr_init_operating_classes(struct mac_context *mac)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- sme_debug("Number of unique supported op classes %d",
|
|
|
- numClasses);
|
|
|
- for (i = 0; i < numClasses; i++)
|
|
|
- sme_debug("supported opClasses[%d] = %d", i, opClasses[i]);
|
|
|
-
|
|
|
/* Set the ordered list of op classes in regdomain
|
|
|
* for use by other modules
|
|
|
*/
|