diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index f6bac1cd67e9..a25cf33594d7 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -1742,19 +1742,19 @@ void csr_packetdump_timer_stop(void); /** * csr_get_channel_status() - get chan info via channel number - * @p_mac: Pointer to Global MAC structure + * @mac: Pointer to Global MAC structure * @channel_id: channel id * * Return: chan status info */ -struct lim_channel_status *csr_get_channel_status(void *p_mac, - uint32_t channel_id); +struct lim_channel_status * +csr_get_channel_status(tpAniSirGlobal mac, uint32_t channel_id); /** * csr_clear_channel_status() - clear chan info - * @p_mac: Pointer to Global MAC structure + * @mac: Pointer to Global MAC structure * * Return: none */ -void csr_clear_channel_status(void *p_mac); +void csr_clear_channel_status(tpAniSirGlobal mac); #endif diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 26cfe3b01c26..5809f288c817 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -6135,38 +6135,35 @@ uint16_t sme_chn_to_freq(uint8_t chanNum) return 0; } -struct lim_channel_status *csr_get_channel_status( - void *p_mac, uint32_t channel_id) +struct lim_channel_status * +csr_get_channel_status(tpAniSirGlobal mac, uint32_t channel_id) { uint8_t i; struct lim_scan_channel_status *channel_status; - tpAniSirGlobal mac_ptr = (tpAniSirGlobal)p_mac; + struct lim_channel_status *entry; - if (!mac_ptr->sap.acs_with_more_param) + if (!mac->sap.acs_with_more_param) return NULL; - channel_status = (struct lim_scan_channel_status *) - &mac_ptr->lim.scan_channel_status; + channel_status = &mac->lim.scan_channel_status; for (i = 0; i < channel_status->total_channel; i++) { - if (channel_status->channel_status_list[i].channel_id == - channel_id) - return &channel_status->channel_status_list[i]; + entry = &channel_status->channel_status_list[i]; + if (entry->channel_id == channel_id) + return entry; } - cds_err("Channel %d status info not exist", channel_id); + sme_err("Channel %d status info not exist", channel_id); return NULL; } -void csr_clear_channel_status(void *p_mac) +void csr_clear_channel_status(tpAniSirGlobal mac) { - tpAniSirGlobal mac_ptr = (tpAniSirGlobal)p_mac; struct lim_scan_channel_status *channel_status; - if (!mac_ptr->sap.acs_with_more_param) + if (!mac->sap.acs_with_more_param) return; - channel_status = (struct lim_scan_channel_status *) - &mac_ptr->lim.scan_channel_status; + channel_status = &mac->lim.scan_channel_status; channel_status->total_channel = 0; return;