From 86c7e9c3b79147ab1b8e32deadaee8688ff32e0b Mon Sep 17 00:00:00 2001 From: Edayilliam Jayadev Date: Mon, 18 May 2020 11:32:01 +0530 Subject: [PATCH] qcacmn: Always populate agile frequency in SAMP message Populate the agile frequency in SAMP message irrespective of the current Spectral mode. CRs-Fixed: 2688422 Change-Id: I2a897449d37a69af2144c9f9710612d6d4a13e8c --- target_if/spectral/target_if_spectral_netlink.c | 6 ++---- target_if/spectral/target_if_spectral_phyerr.c | 11 ++++------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/target_if/spectral/target_if_spectral_netlink.c b/target_if/spectral/target_if_spectral_netlink.c index b833620e864f..81bff6eac8f9 100644 --- a/target_if/spectral/target_if_spectral_netlink.c +++ b/target_if/spectral/target_if_spectral_netlink.c @@ -73,10 +73,8 @@ target_if_spectral_create_samp_msg(struct target_if_spectral *spectral, spec_samp_msg->signature = SPECTRAL_SIGNATURE; spec_samp_msg->freq = params->freq; - if (params->smode == SPECTRAL_SCAN_MODE_AGILE) { - spec_samp_msg->agile_freq1 = params->agile_freq1; - spec_samp_msg->agile_freq2 = params->agile_freq2; - } + spec_samp_msg->agile_freq1 = params->agile_freq1; + spec_samp_msg->agile_freq2 = params->agile_freq2; spec_samp_msg->freq_loading = params->freq_loading; spec_samp_msg->vhtop_ch_freq_seg1 = params->vhtop_ch_freq_seg1; spec_samp_msg->vhtop_ch_freq_seg2 = params->vhtop_ch_freq_seg2; diff --git a/target_if/spectral/target_if_spectral_phyerr.c b/target_if/spectral/target_if_spectral_phyerr.c index 13840a78d343..5c5c082181b0 100644 --- a/target_if/spectral/target_if_spectral_phyerr.c +++ b/target_if/spectral/target_if_spectral_phyerr.c @@ -1992,13 +1992,10 @@ target_if_consume_spectral_report_gen3( params.max_mag = p_sfft->fft_peak_mag; params.freq = p_sops->get_current_channel(spectral); - - if (spectral_mode == SPECTRAL_SCAN_MODE_AGILE) { - params.agile_freq1 = spectral->params[spectral_mode]. - ss_frequency.cfreq1; - params.agile_freq2 = spectral->params[spectral_mode]. - ss_frequency.cfreq2; - } + params.agile_freq1 = spectral->params[SPECTRAL_SCAN_MODE_AGILE]. + ss_frequency.cfreq1; + params.agile_freq2 = spectral->params[SPECTRAL_SCAN_MODE_AGILE]. + ss_frequency.cfreq2; params.noise_floor = report->noisefloor[chn_idx_lowest_enabled]; temp = (uint8_t *)p_fft_report + SPECTRAL_FFT_BINS_POS;