From 79da812012e54c3c6180177c373bb562c66876fc Mon Sep 17 00:00:00 2001 From: Amar Singhal Date: Wed, 26 Oct 2016 16:29:01 -0700 Subject: [PATCH] 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) --- core/cds/src/cds_reg_service.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/cds/src/cds_reg_service.c b/core/cds/src/cds_reg_service.c index b486963516cb..87706810b97b 100644 --- a/core/cds/src/cds_reg_service.c +++ b/core/cds/src/cds_reg_service.c @@ -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)) {