qcacld-3.0: ACS changes for 6ghz

Acs changes for 6ghz to change chan to frequency
in the spectral params structure.

Change-Id: Iffd348ac5c2457b313b702a92b340a258992e764
CRs-Fixed: 2564043
This commit is contained in:
gaurank kathpalia 2019-10-31 21:08:42 +05:30 • committed by nshrivas
commit 0eddedfcc4
4 changed files with 593 additions and 701 deletions

File diff suppressed because it is too large Load diff

View file

@ -102,29 +102,14 @@ typedef enum {
#define SAP_40MHZ_MASK_L 0x03
#define SAP_40MHZ_MASK_H 0x0C
/*
* structs for holding channel bonding bitmap
* used for finding new channel when SAP is on
* DFS channel and radar is detected.
*/
typedef struct sChannelBondingInfo {
uint8_t channelMap:4;
uint8_t rsvd:4;
uint8_t startChannel;
} tChannelBondingInfo;
typedef struct __chan_bonding_bitmap {
tChannelBondingInfo chanBondingSet[MAX_80MHZ_BANDS];
} chan_bonding_bitmap;
typedef struct {
uint16_t chNum; /* Channel Number */
uint16_t channelWidth; /* Channel Width */
uint32_t chan_freq;
uint16_t bssCount; /* bss found in scanresult for this channel */
int32_t rssiAgr; /* Max value of rssi among all BSS(es) from scanresult for this channel */
uint32_t weight; /* Weightage of this channel */
uint32_t weight_copy; /* copy of the orignal weight */
bool valid; /* Is this a valid center frequency for regulatory domain */
bool weight_calc_done;
} tSapSpectChInfo; /* tDfsSpectChInfo; */
/**

View file

@ -1446,12 +1446,12 @@ void csr_packetdump_timer_stop(void);
/**
* csr_get_channel_status() - get chan info via channel number
* @mac: Pointer to Global MAC structure
* @channel_id: channel id
* @chan_freq: channel frequency
*
* Return: chan status info
*/
struct lim_channel_status *
csr_get_channel_status(struct mac_context *mac, uint32_t channel_id);
csr_get_channel_status(struct mac_context *mac, uint32_t chan_freq);
/**
* csr_clear_channel_status() - clear chan info

View file

@ -6207,7 +6207,7 @@ uint16_t sme_chn_to_freq(uint8_t chanNum)
}
struct lim_channel_status *
csr_get_channel_status(struct mac_context *mac, uint32_t channel_id)
csr_get_channel_status(struct mac_context *mac, uint32_t chan_freq)
{
uint8_t i;
struct lim_scan_channel_status *channel_status;
@ -6219,10 +6219,10 @@ csr_get_channel_status(struct mac_context *mac, uint32_t channel_id)
channel_status = &mac->lim.scan_channel_status;
for (i = 0; i < channel_status->total_channel; i++) {
entry = &channel_status->channel_status_list[i];
if (entry->channel_id == channel_id)
if (entry->channelfreq == chan_freq)
return entry;
}
sme_err("Channel %d status info not exist", channel_id);
sme_err("Channel %d status info not exist", chan_freq);
return NULL;
}