qcacld-3.0: Combine channel states only for 80P80

We dont need to combine channel states if the Channel width is not
80P80MHZ. Fix this so the logic is easier to understand.

CRs-Fixed: 1082221
Change-Id: Ie31d564f63278fe6549a2d54165920c28958c274
(cherry picked from commit a53a28f26e2add8309bb0c2ebacaa8f97f2506d3)
This commit is contained in:
Amar Singhal 2016-10-26 16:29:01 -07:00 • committed by Gerrit - the friendly Code Review server
commit 79da812012

View file

@ -486,13 +486,14 @@ static void cds_set_5g_channel_params(uint16_t oper_ch,
chan_state = cds_get_5g_bonded_channel_state(oper_ch,
ch_params->ch_width);
if (CH_WIDTH_80P80MHZ == ch_params->ch_width)
if (CH_WIDTH_80P80MHZ == ch_params->ch_width) {
chan_state2 = cds_get_5g_bonded_channel_state(
ch_params->center_freq_seg1 - 2,
CH_WIDTH_80MHZ);
chan_state = cds_combine_channel_states(chan_state,
chan_state2);
chan_state = cds_combine_channel_states(chan_state,
chan_state2);
}
if ((CHANNEL_STATE_ENABLE == chan_state) ||
(CHANNEL_STATE_DFS == chan_state)) {