qcacld-3.0: Replace channel ID with channel frequency

Replace channel ID(rx_channel) with channel frequency(
rx_freq) in struct bss_description.

Remove a few camel cases in function
lim_collect_bss_description.

Change-Id: Ic6051fa62d2fe0aa10a6d2a3568aeff75daa813f
CRs-Fixed: 2492155
This commit is contained in:
wadesong 2019-07-15 15:00:31 +08:00 committed by nshrivas
parent 2c01763092
commit f2d0db7930
3 changed files with 5 additions and 5 deletions

View File

@ -681,7 +681,7 @@ struct bss_description {
/* whether it is from a probe rsp */
uint8_t fProbeRsp;
/* Actual channel the beacon/probe response was received on */
uint8_t rx_channel;
uint32_t rx_freq;
tSirMacSeqCtl seq_ctrl;
uint32_t WscIeLen;
uint8_t WscIeProbeRsp[WSCIE_PROBE_RSP_LEN];

View File

@ -70,7 +70,7 @@ lim_collect_bss_description(struct mac_context *mac,
uint32_t ieLen = 0;
tpSirMacMgmtHdr pHdr;
uint8_t channel_num;
uint8_t rxChannel;
uint8_t rx_channel;
uint8_t rfBand = 0;
pHdr = WMA_GET_RX_MAC_HEADER(pRxPacketInfo);
@ -82,7 +82,7 @@ lim_collect_bss_description(struct mac_context *mac,
}
ieLen =
WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo) - SIR_MAC_B_PR_SSID_OFFSET;
rxChannel = WMA_GET_RX_CH(pRxPacketInfo);
rx_channel = WMA_GET_RX_CH(pRxPacketInfo);
pBody = WMA_GET_RX_MPDU_DATA(pRxPacketInfo);
rfBand = WMA_GET_RX_RFBAND(pRxPacketInfo);
@ -137,7 +137,7 @@ lim_collect_bss_description(struct mac_context *mac,
pBssDescr->chan_freq = wlan_reg_chan_to_freq(mac->pdev, channel_num);
pBssDescr->freq_self = pBssDescr->chan_freq;
pBssDescr->rx_channel = rxChannel;
pBssDescr->rx_freq = wlan_reg_chan_to_freq(mac->pdev, rx_channel);
/* set the network type in bss description */
pBssDescr->nwType =

View File

@ -2650,7 +2650,7 @@ static QDF_STATUS csr_fill_bss_from_scan_entry(struct mac_context *mac_ctx,
bss_desc->freq_self =
wlan_reg_chan_to_freq(mac_ctx->pdev,
scan_entry->channel.chan_idx);
bss_desc->rx_channel = 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] =