diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index d53905264ba6..676178deeab1 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -3568,31 +3568,31 @@ typedef struct sSirScanOffloadReq { } tSirScanOffloadReq, *tpSirScanOffloadReq; /** - * lim_scan_event_type - scan event types used in LIM - * @LIM_SCAN_EVENT_STARTED - scan command accepted by FW - * @LIM_SCAN_EVENT_COMPLETED - scan has been completed by FW - * @LIM_SCAN_EVENT_BSS_CHANNEL - FW is going to move to HOME channel - * @LIM_SCAN_EVENT_FOREIGN_CHANNEL - FW is going to move to FORIEGN channel - * @LIM_SCAN_EVENT_DEQUEUED - scan request got dequeued - * @LIM_SCAN_EVENT_PREEMPTED - preempted by other high priority scan - * @LIM_SCAN_EVENT_START_FAILED - scan start failed - * @LIM_SCAN_EVENT_RESTARTED - scan restarted - * @LIM_SCAN_EVENT_MAX - max value for event type + * sir_scan_event_type - scan event types used in LIM + * @SIR_SCAN_EVENT_STARTED - scan command accepted by FW + * @SIR_SCAN_EVENT_COMPLETED - scan has been completed by FW + * @SIR_SCAN_EVENT_BSS_CHANNEL - FW is going to move to HOME channel + * @SIR_SCAN_EVENT_FOREIGN_CHANNEL - FW is going to move to FORIEGN channel + * @SIR_SCAN_EVENT_DEQUEUED - scan request got dequeued + * @SIR_SCAN_EVENT_PREEMPTED - preempted by other high priority scan + * @SIR_SCAN_EVENT_START_FAILED - scan start failed + * @SIR_SCAN_EVENT_RESTARTED - scan restarted + * @SIR_SCAN_EVENT_MAX - max value for event type */ -enum lim_scan_event_type { - LIM_SCAN_EVENT_STARTED = 0x1, - LIM_SCAN_EVENT_COMPLETED = 0x2, - LIM_SCAN_EVENT_BSS_CHANNEL = 0x4, - LIM_SCAN_EVENT_FOREIGN_CHANNEL = 0x8, - LIM_SCAN_EVENT_DEQUEUED = 0x10, - LIM_SCAN_EVENT_PREEMPTED = 0x20, - LIM_SCAN_EVENT_START_FAILED = 0x40, - LIM_SCAN_EVENT_RESTARTED = 0x80, - LIM_SCAN_EVENT_MAX = 0x8000 +enum sir_scan_event_type { + SIR_SCAN_EVENT_STARTED = 0x1, + SIR_SCAN_EVENT_COMPLETED = 0x2, + SIR_SCAN_EVENT_BSS_CHANNEL = 0x4, + SIR_SCAN_EVENT_FOREIGN_CHANNEL = 0x8, + SIR_SCAN_EVENT_DEQUEUED = 0x10, + SIR_SCAN_EVENT_PREEMPTED = 0x20, + SIR_SCAN_EVENT_START_FAILED = 0x40, + SIR_SCAN_EVENT_RESTARTED = 0x80, + SIR_SCAN_EVENT_MAX = 0x8000 }; typedef struct sSirScanOffloadEvent { - enum lim_scan_event_type event; + enum sir_scan_event_type event; tSirResultCodes reasonCode; uint32_t chanFreq; uint32_t requestor; diff --git a/core/mac/src/pe/include/lim_ft.h b/core/mac/src/pe/include/lim_ft.h index 01307d77f5a3..e4751139a6f2 100644 --- a/core/mac/src/pe/include/lim_ft.h +++ b/core/mac/src/pe/include/lim_ft.h @@ -67,7 +67,7 @@ void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, tpPESession psessionEntry); void lim_process_mlm_reassoc_req(tpAniSirGlobal mac_ctx, uint32_t *msg); void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx, - enum lim_scan_event_type event, + enum sir_scan_event_type event, uint8_t session_id, uint32_t scan_id); QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx, @@ -95,7 +95,7 @@ static inline void lim_process_mlm_reassoc_req(tpAniSirGlobal mac_ctx, uint32_t *msg) {} static inline void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx, - enum lim_scan_event_type event, + enum sir_scan_event_type event, uint8_t session_id, uint32_t scan_id) {} static inline int lim_process_ft_pre_auth_req(tpAniSirGlobal pMac, diff --git a/core/mac/src/pe/lim/lim_ft_preauth.c b/core/mac/src/pe/lim/lim_ft_preauth.c index 7c9ffd432b71..1cb55a9b38da 100644 --- a/core/mac/src/pe/lim/lim_ft_preauth.c +++ b/core/mac/src/pe/lim/lim_ft_preauth.c @@ -736,7 +736,7 @@ QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx, */ void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx, - enum lim_scan_event_type event, + enum sir_scan_event_type event, uint8_t session_id, uint32_t scan_id) { @@ -750,14 +750,14 @@ void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx, } switch (event) { - case LIM_SCAN_EVENT_START_FAILED: + case SIR_SCAN_EVENT_START_FAILED: /* Scan command is rejected by firmware */ lim_log(mac_ctx, LOGE, FL("Failed to start preauth scan")); lim_post_ft_pre_auth_rsp(mac_ctx, eSIR_FAILURE, NULL, 0, session_entry); return; - case LIM_SCAN_EVENT_COMPLETED: + case SIR_SCAN_EVENT_COMPLETED: /* * Scan either completed succesfully or or got terminated * after successful auth, or timed out. Either way, STA @@ -767,7 +767,7 @@ void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx, session_entry); break; - case LIM_SCAN_EVENT_FOREIGN_CHANNEL: + case SIR_SCAN_EVENT_FOREIGN_CHANNEL: /* Sta is on candidate channel. Send auth */ lim_perform_ft_pre_auth(mac_ctx, QDF_STATUS_SUCCESS, NULL, session_entry); diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index dd611555841a..4659053ecb90 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -3298,10 +3298,10 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf) "scan_id = %u, scan_requestor_id 0x%x", pScanEvent->scanId, pScanEvent->requestor); switch (pScanEvent->event) { - case LIM_SCAN_EVENT_STARTED: + case SIR_SCAN_EVENT_STARTED: break; - case LIM_SCAN_EVENT_START_FAILED: - case LIM_SCAN_EVENT_COMPLETED: + case SIR_SCAN_EVENT_START_FAILED: + case SIR_SCAN_EVENT_COMPLETED: if (ROC_SCAN_REQUESTOR_ID == pScanEvent->requestor) { lim_send_sme_roc_rsp(pMac, eWNI_SME_REMAIN_ON_CHN_RSP, QDF_STATUS_SUCCESS, @@ -3329,7 +3329,7 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf) lim_send_scan_offload_complete(pMac, pScanEvent); } break; - case LIM_SCAN_EVENT_FOREIGN_CHANNEL: + case SIR_SCAN_EVENT_FOREIGN_CHANNEL: if (ROC_SCAN_REQUESTOR_ID == pScanEvent->requestor) { /*Send Ready on channel indication to SME */ if (pMac->lim.gpLimRemainOnChanReq) { @@ -3348,9 +3348,9 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf) pScanEvent->scanId); } break; - case LIM_SCAN_EVENT_BSS_CHANNEL: - case LIM_SCAN_EVENT_DEQUEUED: - case LIM_SCAN_EVENT_PREEMPTED: + case SIR_SCAN_EVENT_BSS_CHANNEL: + case SIR_SCAN_EVENT_DEQUEUED: + case SIR_SCAN_EVENT_PREEMPTED: default: QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, "Received unhandled scan event %u", diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 6f776835d919..91212cd44cd6 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -3173,7 +3173,7 @@ int wma_nlo_scan_cmp_evt_handler(void *handle, uint8_t *event, WIFI_POWER_EVENT_WAKELOCK_PNO); qdf_mem_zero(scan_event, sizeof(tSirScanOffloadEvent)); scan_event->reasonCode = eSIR_PNO_SCAN_SUCCESS; - scan_event->event = LIM_SCAN_EVENT_COMPLETED; + scan_event->event = SIR_SCAN_EVENT_COMPLETED; scan_event->sessionId = nlo_event->vdev_id; wma_send_msg(wma, WMA_RX_SCAN_EVENT, (void *)scan_event, 0); } else { @@ -5248,7 +5248,7 @@ int wma_scan_event_callback(WMA_HANDLE handle, uint8_t *data, if (scan_event->scanId == wma_handle->interfaces[vdev_id].p2p_scan_info.scan_id) { scan_event->p2pScanType = P2P_SCAN_TYPE_LISTEN; - if (scan_event->event == LIM_SCAN_EVENT_COMPLETED) + if (scan_event->event == SIR_SCAN_EVENT_COMPLETED) wma_reset_p2p_scan_info(wma_handle, vdev_id); } scan_event->sessionId = vdev_id; @@ -5286,7 +5286,7 @@ int wma_scan_event_callback(WMA_HANDLE handle, uint8_t *data, /* Stop scan completion timeout if event is WMI_SCAN_EVENT_COMPLETED */ if (scan_event->event == - (enum lim_scan_event_type) WMI_SCAN_EVENT_COMPLETED) { + (enum sir_scan_event_type) WMI_SCAN_EVENT_COMPLETED) { WMA_LOGE("scan complete:scan_id 0x%x, requestor 0x%x, vdev %d", wmi_event->scan_id, wmi_event->requestor, vdev_id); }