samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Actions Packages Projekty Wydania Wiki Aktywność

qcacld-3.0: Use frequency based channel enumerations

Przeglądaj źródła 
CONFIG_LEGACY_CHAN_ENUM has been removed. That macro needs channel number
based enumeration. Use channel frequency going forward. So change to
frequency based channel enumeration.

Change-Id: I234eb070a6dcfaf3325bbd523c19188d5b2bbd24
CRs-Fixed: 2513098
This commit is contained in:
Amar Singhal
2019-08-06 12:47:18 -07:00
zatwierdzone przez nshrivas
rodzic 40dd5196a2
commit 2e4ccccf54
7 zmienionych plików z 52 dodań i 46 usunięć
Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

20
core/sap/src/sap_ch_select.c
Wyświetl plik

@@ -1975,8 +1975,8 @@ static void sap_sort_chl_weight_ht80(tSapChSelSpectInfo *pSpectInfoParams)
*/
pSpectInfo = pSpectInfoParams->pSpectCh;
for (j = 0; j < pSpectInfoParams->numSpectChans; j++) {
if ((pSpectInfo[j].chNum >= WLAN_REG_CH_NUM(CHAN_ENUM_1) &&
pSpectInfo[j].chNum <= WLAN_REG_CH_NUM(CHAN_ENUM_14)) ||
if ((pSpectInfo[j].chNum >= WLAN_REG_CH_NUM(CHAN_ENUM_2412) &&
pSpectInfo[j].chNum <= WLAN_REG_CH_NUM(CHAN_ENUM_2484)) ||
(pSpectInfo[j].chNum >= CHANNEL_165))
pSpectInfo[j].weight = SAP_ACS_WEIGHT_MAX * 4;
}
@@ -2120,10 +2120,10 @@ static void sap_sort_chl_weight_vht160(tSapChSelSpectInfo *pSpectInfoParams)
*/
pSpectInfo = pSpectInfoParams->pSpectCh;
for (j = 0; j < pSpectInfoParams->numSpectChans; j++) {
if ((pSpectInfo[j].chNum >= WLAN_REG_CH_NUM(CHAN_ENUM_1) &&
pSpectInfo[j].chNum <= WLAN_REG_CH_NUM(CHAN_ENUM_14)) ||
(pSpectInfo[j].chNum >= WLAN_REG_CH_NUM(CHAN_ENUM_132) &&
pSpectInfo[j].chNum <= WLAN_REG_CH_NUM(CHAN_ENUM_173)))
if ((pSpectInfo[j].chNum >= WLAN_REG_CH_NUM(CHAN_ENUM_2412) &&
pSpectInfo[j].chNum <= WLAN_REG_CH_NUM(CHAN_ENUM_2484)) ||
(pSpectInfo[j].chNum >= WLAN_REG_CH_NUM(CHAN_ENUM_5660) &&
pSpectInfo[j].chNum <= WLAN_REG_CH_NUM(CHAN_ENUM_5865)))
pSpectInfo[j].weight = SAP_ACS_WEIGHT_MAX * 8;
}
@@ -2158,8 +2158,8 @@ static void sap_allocate_max_weight_ht40_24_g(
*/
spect_info = spect_info_params->pSpectCh;
for (j = 0; j < spect_info_params->numSpectChans; j++) {
if ((spect_info[j].chNum >= WLAN_REG_CH_NUM(CHAN_ENUM_1) &&
spect_info[j].chNum <= WLAN_REG_CH_NUM(CHAN_ENUM_14)))
if ((spect_info[j].chNum >= WLAN_REG_CH_NUM(CHAN_ENUM_2412) &&
spect_info[j].chNum <= WLAN_REG_CH_NUM(CHAN_ENUM_2484)))
spect_info[j].weight = SAP_ACS_WEIGHT_MAX * 2;
}
}
@@ -2183,8 +2183,8 @@ static void sap_allocate_max_weight_ht40_5_g(
*/
spect_info = spect_info_params->pSpectCh;
for (j = 0; j < spect_info_params->numSpectChans; j++) {
if ((spect_info[j].chNum >= WLAN_REG_CH_NUM(CHAN_ENUM_36) &&
spect_info[j].chNum <= WLAN_REG_CH_NUM(CHAN_ENUM_173)))
if ((spect_info[j].chNum >= WLAN_REG_CH_NUM(CHAN_ENUM_5180) &&
spect_info[j].chNum <= WLAN_REG_CH_NUM(CHAN_ENUM_5865)))
spect_info[j].weight = SAP_ACS_WEIGHT_MAX * 2;
}
}

12
core/sap/src/sap_fsm.c
Wyświetl plik

@@ -3274,10 +3274,10 @@ static QDF_STATUS sap_get_freq_list(struct sap_context *sap_ctx,
en_lte_coex = mac_ctx->mlme_cfg->sap_cfg.enable_lte_coex;
/* Check if LTE coex is enabled and 2.4GHz is selected */
if (en_lte_coex && (band_start_ch == CHAN_ENUM_1) &&
(band_end_ch == CHAN_ENUM_14)) {
if (en_lte_coex && (band_start_ch == CHAN_ENUM_2412) &&
(band_end_ch == CHAN_ENUM_2484)) {
/* Set 2.4GHz upper limit to channel 9 for LTE COEX */
band_end_ch = CHAN_ENUM_9;
band_end_ch = CHAN_ENUM_2452;
}
/* Allocate the max number of channel supported */
@@ -3353,15 +3353,15 @@ static QDF_STATUS sap_get_freq_list(struct sap_context *sap_ctx,
* band. So, don't even scan on 2.4Ghz channels if bw is
* 40/80/160Mhz and channel list has any 5Ghz channel.
*/
if (end_ch_num >= WLAN_REG_CH_NUM(CHAN_ENUM_36) &&
if (end_ch_num >= WLAN_REG_CH_NUM(CHAN_ENUM_5180) &&
((ch_width == CH_WIDTH_40MHZ) ||
(ch_width == CH_WIDTH_80MHZ) ||
(ch_width == CH_WIDTH_80P80MHZ) ||
(ch_width == CH_WIDTH_160MHZ))) {
if (WLAN_REG_CH_NUM(loop_count) >=
WLAN_REG_CH_NUM(CHAN_ENUM_1) &&
WLAN_REG_CH_NUM(CHAN_ENUM_2412) &&
WLAN_REG_CH_NUM(loop_count) <=
WLAN_REG_CH_NUM(CHAN_ENUM_14))
WLAN_REG_CH_NUM(CHAN_ENUM_2484))
continue;
}

16
core/sap/src/sap_module.c
Wyświetl plik

@@ -1254,7 +1254,7 @@ QDF_STATUS wlansap_deauth_sta(struct sap_context *sap_ctx,
*/
static QDF_STATUS
wlansap_update_csa_channel_params(struct sap_context *sap_context,
uint32_t channel)
enum channel_enum channel)
{
struct mac_context *mac_ctx;
uint8_t bw;
@@ -1265,7 +1265,7 @@ wlansap_update_csa_channel_params(struct sap_context *sap_context,
return QDF_STATUS_E_FAULT;
}
if (channel <= CHAN_ENUM_14) {
if (channel <= CHAN_ENUM_2484) {
/*
* currently OBSS scan is done in hostapd, so to avoid
* SAP coming up in HT40 on channel switch we are
@@ -2347,15 +2347,15 @@ void wlansap_extend_to_acs_range(mac_handle_t mac_handle,
return;
}
if (*startChannelNum <= 14 && *endChannelNum <= 14) {
*bandStartChannel = CHAN_ENUM_1;
*bandEndChannel = CHAN_ENUM_14;
*bandStartChannel = CHAN_ENUM_2412;
*bandEndChannel = CHAN_ENUM_2484;
tmp_startChannelNum = *startChannelNum > 5 ?
(*startChannelNum - ACS_2G_EXTEND) : 1;
tmp_endChannelNum = (*endChannelNum + ACS_2G_EXTEND) <= 14 ?
(*endChannelNum + ACS_2G_EXTEND) : 14;
} else if (*startChannelNum >= 36 && *endChannelNum >= 36) {
*bandStartChannel = CHAN_ENUM_36;
*bandEndChannel = CHAN_ENUM_173;
*bandStartChannel = CHAN_ENUM_5180;
*bandEndChannel = CHAN_ENUM_5865;
tmp_startChannelNum = (*startChannelNum - ACS_5G_EXTEND) > 36 ?
(*startChannelNum - ACS_5G_EXTEND) : 36;
tmp_endChannelNum = (*endChannelNum + ACS_5G_EXTEND) <=
@@ -2363,8 +2363,8 @@ void wlansap_extend_to_acs_range(mac_handle_t mac_handle,
(*endChannelNum + ACS_5G_EXTEND) :
WNI_CFG_CURRENT_CHANNEL_STAMAX;
} else {
*bandStartChannel = CHAN_ENUM_1;
*bandEndChannel = CHAN_ENUM_173;
*bandStartChannel = CHAN_ENUM_2412;
*bandEndChannel = CHAN_ENUM_5865;
tmp_startChannelNum = *startChannelNum > 5 ?
(*startChannelNum - ACS_2G_EXTEND) : 1;
tmp_endChannelNum = (*endChannelNum + ACS_5G_EXTEND) <=