A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 16:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Correct API for acs channel range validation

Browse source 
qcacld-2.0 to qcacld-3.0 propagation

Add changes to correct the function to check for acs channel range.

CRs-Fixed: 1117328
Change-Id: Ie0a53c2f5ee26552d36da0e6c4dcda124abc71a7
This commit is contained in:
Kapil Gupta 2017-02-21 19:16:19 +05:30 • committed by Sandeep Puligilla
commit 43c2f997ea
2 changed files with 37 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

62
core/sap/src/sap_fsm.c
View file

@ -1280,6 +1280,37 @@ bool sap_check_in_avoid_ch_list(ptSapContext sap_ctx, uint8_t channel)
}
#endif /* FEATURE_AP_MCC_CH_AVOIDANCE */
/**
* sap_is_valid_acs_channel() - checks if given channel is in acs channel range
* @sap_ctx: sap context.
* @channel: channel to be checked in acs range
*
* Return: true, if channel is valid, false otherwise.
*/
static bool sap_is_valid_acs_channel(ptSapContext sap_ctx, uint8_t channel)
{
int i = 0;
/* Check whether acs is enabled */
if (!sap_ctx->acs_cfg->acs_mode)
return true;
if ((channel < sap_ctx->acs_cfg->start_ch) ||
(channel > sap_ctx->acs_cfg->end_ch)) {
return false;
}
if (!sap_ctx->acs_cfg->ch_list) {
/* List not present, return */
return true;
} else {
for (i = 0; i < sap_ctx->acs_cfg->ch_list_count; i++)
if (channel == sap_ctx->acs_cfg->ch_list[i])
return true;
}
return false;
}
/**
* sap_apply_rules() - validates channels in sap_ctx channel list
* @sap_ctx: sap context pointer
@ -1299,7 +1330,7 @@ static uint8_t sap_apply_rules(ptSapContext sap_ctx)
uint8_t num_valid_ch, i = 0, ch_id;
tAll5GChannelList *sap_all_ch = &sap_ctx->SapAllChnlList;
bool is_ch_nol = false;
bool is_out_of_range = false;
bool is_valid_acs_chan = false;
tpAniSirGlobal mac_ctx;
tHalHandle hal = CDS_GET_HAL_CB(sap_ctx->p_cds_gctx);
uint8_t preferred_location;
@ -1410,15 +1441,16 @@ static uint8_t sap_apply_rules(ptSapContext sap_ctx)
#endif /* FEATURE_AP_MCC_CH_AVOIDANCE */
/* check if the channel is within ACS channel range */
is_out_of_range = sap_acs_channel_check(sap_ctx, ch_id);
if (true == is_out_of_range) {
is_valid_acs_chan = sap_is_valid_acs_channel(sap_ctx, ch_id);
if (is_valid_acs_chan == false) {
/*
* mark this channel invalid since it is out of ACS
* channel range
*/
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
FL("index: %d, Channel = %d out of ACS channel range"),
i, ch_id);
FL("index=%d, Channel=%d out of ACS chan range %d-%d"),
i, ch_id, sap_ctx->acs_cfg->start_ch,
sap_ctx->acs_cfg->end_ch);
sap_all_ch->channelList[i].valid = false;
num_valid_ch--;
continue;
@ -1792,26 +1824,6 @@ static uint8_t sap_random_channel_sel(ptSapContext sap_ctx)
return target_channel;
}
bool sap_acs_channel_check(ptSapContext sapContext, uint8_t channelNumber)
{
int i = 0;
if (!sapContext->acs_cfg->acs_mode)
return false;
if ((channelNumber >= sapContext->acs_cfg->start_ch) &&
(channelNumber <= sapContext->acs_cfg->end_ch)) {
if (!sapContext->acs_cfg->ch_list) {
return false;
} else {
for (i = 0; i < sapContext->acs_cfg->ch_list_count; i++)
if (channelNumber ==
sapContext->acs_cfg->ch_list[i])
return false;
}
}
return true;
}
/**
* sap_mark_dfs_channels() - to mark dfs channel
* @sapContext: pointer sap context

2
core/sap/src/sap_internal.h
View file

@ -394,8 +394,6 @@ void sap_dfs_cac_timer_callback(void *data);
void sap_cac_reset_notify(tHalHandle hHal);
bool sap_acs_channel_check(ptSapContext sapContext, uint8_t channelNumber);
bool
sap_channel_matrix_check(ptSapContext sapContext,
ePhyChanBondState cbMode,