diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index becec70169..5a8845e233 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -661,10 +661,6 @@ struct bss_description { /* channelId what peer sent in beacon/probersp. */ uint8_t channelId; uint32_t chan_freq; - /* channelId on which we are parked at. */ - /* used only in scan case. */ - uint32_t freq_self; - uint8_t sSirBssDescriptionRsvd[3]; /* Based on system time, not a relative time. */ uint64_t received_time; uint32_t parentTSF; @@ -675,17 +671,10 @@ struct bss_description { #ifdef FEATURE_WLAN_ESE uint16_t QBSSLoad_present; uint16_t QBSSLoad_avail; - /* To achieve 8-byte alignment with ESE enabled */ - uint32_t reservedPadding5; #endif /* whether it is from a probe rsp */ uint8_t fProbeRsp; - /* Actual channel the beacon/probe response was received on */ - uint32_t rx_freq; tSirMacSeqCtl seq_ctrl; - uint32_t WscIeLen; - uint8_t WscIeProbeRsp[WSCIE_PROBE_RSP_LEN]; - uint8_t reservedPadding4; uint32_t tsf_delta; struct scan_mbssid_info mbssid_info; #ifdef WLAN_FEATURE_FILS_SK diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index 7d3a008d0f..3a4268c056 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -2197,7 +2197,6 @@ lim_roam_fill_bss_descr(struct mac_context *mac, cds_freq_to_chan(roam_synch_ind_ptr->chan_freq); bss_desc_ptr->chan_freq = roam_synch_ind_ptr->chan_freq; } - bss_desc_ptr->freq_self = bss_desc_ptr->chan_freq; bss_desc_ptr->nwType = lim_get_nw_type( mac, diff --git a/core/mac/src/pe/lim/lim_scan_result_utils.c b/core/mac/src/pe/lim/lim_scan_result_utils.c index c9900f7280..2bf03e88f2 100644 --- a/core/mac/src/pe/lim/lim_scan_result_utils.c +++ b/core/mac/src/pe/lim/lim_scan_result_utils.c @@ -136,9 +136,6 @@ lim_collect_bss_description(struct mac_context *mac, pBssDescr->channelId = channel_num; pBssDescr->chan_freq = wlan_reg_chan_to_freq(mac->pdev, channel_num); - pBssDescr->freq_self = pBssDescr->chan_freq; - pBssDescr->rx_freq = wlan_reg_chan_to_freq(mac->pdev, rx_channel); - /* set the network type in bss description */ pBssDescr->nwType = lim_get_nw_type(mac, channel_num, SIR_MAC_MGMT_FRAME, pBPR); diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index 2f30d91cf7..24ce57bf1c 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -2634,12 +2634,6 @@ static QDF_STATUS csr_fill_bss_from_scan_entry(struct mac_context *mac_ctx, bss_desc->chan_freq = wlan_reg_chan_to_freq(mac_ctx->pdev, scan_entry->channel.chan_idx); - /* channelId on which we are parked at. */ - /* used only in scan case. */ - bss_desc->freq_self = - wlan_reg_chan_to_freq(mac_ctx->pdev, - scan_entry->channel.chan_idx); - bss_desc->rx_freq = bss_desc->freq_self; bss_desc->received_time = scan_entry->scan_entry_time; bss_desc->startTSF[0] = @@ -2686,12 +2680,6 @@ static QDF_STATUS csr_fill_bss_from_scan_entry(struct mac_context *mac_ctx, } #endif csr_update_bss_with_fils_data(mac_ctx, scan_entry, bss_desc); - if (scan_entry->alt_wcn_ie.ptr) { - bss_desc->WscIeLen = scan_entry->alt_wcn_ie.len; - qdf_mem_copy(bss_desc->WscIeProbeRsp, - scan_entry->alt_wcn_ie.ptr, - scan_entry->alt_wcn_ie.len); - } *p_result = bss; return QDF_STATUS_SUCCESS;