samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Correct judgement about roaming dfs channel flag

Browse Source 
It will ignore dfs channel since checking the flag of roaming dfs
channel wrongly.

Change-Id: I7c4ee9c12d42b7c8351ff81c389adba83eac0f26
CRs-Fixed: 2385147
This commit is contained in:
Wu Gao
2019-01-24 14:08:16 +08:00
committed by nshrivas
parent ca0baaad8a
commit ff39f5f03c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/sme/inc/csr_internal.h
View File

@@ -60,7 +60,7 @@
#define CSR_MAX_NUM_COUNTRY_CODE 100 #define CSR_MAX_NUM_COUNTRY_CODE 100
#define CSR_IS_DFS_CH_ROAM_ALLOWED(mac_ctx) \ #define CSR_IS_DFS_CH_ROAM_ALLOWED(mac_ctx) \
( \ ( \
((((mac_ctx)->mlme_cfg->lfr.roaming_dfs_channel) == \ ((((mac_ctx)->mlme_cfg->lfr.roaming_dfs_channel) != \
ROAMING_DFS_CHANNEL_DISABLED) ? true : false) \ ROAMING_DFS_CHANNEL_DISABLED) ? true : false) \
) )
#define CSR_IS_SELECT_5GHZ_MARGIN(mac) \ #define CSR_IS_SELECT_5GHZ_MARGIN(mac) \

8
core/sme/src/csr/csr_api_roam.c
View File

@@ -2044,7 +2044,7 @@ csr_fetch_ch_lst_from_received_list(struct mac_context *mac_ctx,
ch_lst = curr_ch_lst_info->ChannelList; ch_lst = curr_ch_lst_info->ChannelList;
for (i = 0; i < curr_ch_lst_info->numOfChannels; i++) { for (i = 0; i < curr_ch_lst_info->numOfChannels; i++) {
if (((mac_ctx->mlme_cfg->lfr.roaming_dfs_channel != if (((mac_ctx->mlme_cfg->lfr.roaming_dfs_channel ==
ROAMING_DFS_CHANNEL_DISABLED) || ROAMING_DFS_CHANNEL_DISABLED) ||
(mac_ctx->roam.configParam.sta_roam_policy.dfs_mode == (mac_ctx->roam.configParam.sta_roam_policy.dfs_mode ==
CSR_STA_ROAM_POLICY_DFS_DISABLED)) && CSR_STA_ROAM_POLICY_DFS_DISABLED)) &&
@@ -17248,7 +17248,7 @@ csr_fetch_ch_lst_from_ini(struct mac_context *mac_ctx,
if (!csr_check_band_channel_match(band, *ch_lst)) if (!csr_check_band_channel_match(band, *ch_lst))
continue; continue;
/* Allow DFS channels only if the DFS roaming is enabled */ /* Allow DFS channels only if the DFS roaming is enabled */
if (((mac_ctx->mlme_cfg->lfr.roaming_dfs_channel != if (((mac_ctx->mlme_cfg->lfr.roaming_dfs_channel ==
ROAMING_DFS_CHANNEL_DISABLED) || ROAMING_DFS_CHANNEL_DISABLED) ||
(mac_ctx->roam.configParam.sta_roam_policy.dfs_mode == (mac_ctx->roam.configParam.sta_roam_policy.dfs_mode ==
CSR_STA_ROAM_POLICY_DFS_DISABLED)) && CSR_STA_ROAM_POLICY_DFS_DISABLED)) &&
@@ -17330,7 +17330,7 @@ csr_fetch_ch_lst_from_occupied_lst(struct mac_context *mac_ctx,
sizeof(unsafe_chan)); sizeof(unsafe_chan));
for (i = 0; i < mac_ctx->scan.occupiedChannels[session_id].numChannels; for (i = 0; i < mac_ctx->scan.occupiedChannels[session_id].numChannels;
i++) { i++) {
if (((mac_ctx->mlme_cfg->lfr.roaming_dfs_channel != if (((mac_ctx->mlme_cfg->lfr.roaming_dfs_channel ==
ROAMING_DFS_CHANNEL_DISABLED) || ROAMING_DFS_CHANNEL_DISABLED) ||
(mac_ctx->roam.configParam.sta_roam_policy.dfs_mode == (mac_ctx->roam.configParam.sta_roam_policy.dfs_mode ==
CSR_STA_ROAM_POLICY_DFS_DISABLED)) && CSR_STA_ROAM_POLICY_DFS_DISABLED)) &&
@@ -17440,7 +17440,7 @@ csr_fetch_valid_ch_lst(struct mac_context *mac_ctx,
continue; continue;
} }
if (((mac_ctx->mlme_cfg->lfr.roaming_dfs_channel != if (((mac_ctx->mlme_cfg->lfr.roaming_dfs_channel ==
ROAMING_DFS_CHANNEL_DISABLED) || ROAMING_DFS_CHANNEL_DISABLED) ||
(mac_ctx->roam.configParam.sta_roam_policy.dfs_mode == (mac_ctx->roam.configParam.sta_roam_policy.dfs_mode ==
CSR_STA_ROAM_POLICY_DFS_DISABLED)) && CSR_STA_ROAM_POLICY_DFS_DISABLED)) &&