From 7e11aadd9dd87dcc7d0466b73f9f6a94a53e8a49 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Thu, 20 Aug 2020 12:27:07 -0700 Subject: [PATCH] qcacld-3.0: Replace QDF_TRACE(QDF_MODULE_ID_SAP,...) with sap log macros qcacld-3.0: Replace QDF_TRACE(QDF_MODULE_ID_SAP,...) with sap_{debug|info|warn|err|alert()} CRs-Fixed: 2755126 Change-Id: I58ef919175e0043b8a5a60c7a14e4ca3e672cb84 --- core/sap/src/sap_api_link_cntl.c | 210 ++++---------- core/sap/src/sap_ch_select.c | 36 +-- core/sap/src/sap_fsm.c | 483 +++++++++++-------------------- core/sap/src/sap_module.c | 134 ++++----- 4 files changed, 277 insertions(+), 586 deletions(-) diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c index 1a4c6a637414..a33fd28178b5 100644 --- a/core/sap/src/sap_api_link_cntl.c +++ b/core/sap/src/sap_api_link_cntl.c @@ -145,8 +145,7 @@ static QDF_STATUS sap_hdd_signal_event_handler(void *ctx) QDF_STATUS status; if (!sap_ctx) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("sap context is not valid")); + sap_err("sap context is not valid"); return QDF_STATUS_E_FAILURE; } status = sap_signal_hdd_event(sap_ctx, NULL, @@ -185,15 +184,12 @@ static void wlansap_send_acs_success_event(struct sap_context *sap_ctx, uint32_t scan_id) { if (scan_id) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("Sending ACS Scan skip event")); + sap_debug("Sending ACS Scan skip event"); sap_signal_hdd_event(sap_ctx, NULL, eSAP_ACS_SCAN_SUCCESS_EVENT, (void *)eSAP_STATUS_SUCCESS); } else { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("ACS scanid: %d (skipped ACS SCAN)"), - scan_id); + sap_debug("ACS scanid: %d (skipped ACS SCAN)", scan_id); } } #else @@ -225,8 +221,7 @@ wlansap_calculate_chan_from_scan_result(mac_handle_t mac_handle, qdf_mem_free(filter); if (list) - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("num_entries %d"), qdf_list_size(list)); + sap_debug("num_entries %d", qdf_list_size(list)); wlansap_send_acs_success_event(sap_ctx, scan_id); @@ -331,8 +326,7 @@ QDF_STATUS wlansap_pre_start_bss_acs_scan_callback(mac_handle_t mac_handle, goto close_session; } if (eCSR_SCAN_SUCCESS != scan_status) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("CSR scan_status = eCSR_SCAN_ABORT/FAILURE (%d), choose default channel"), + sap_err("CSR scan_status = eCSR_SCAN_ABORT/FAILURE (%d), choose default channel", scan_status); oper_channel = sap_select_default_oper_chan(mac_ctx, @@ -345,15 +339,13 @@ QDF_STATUS wlansap_pre_start_bss_acs_scan_callback(mac_handle_t mac_handle, sap_ctx->sap_status = eSAP_STATUS_SUCCESS; goto close_session; } - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR scan_status = eCSR_SCAN_SUCCESS (%d)"), scan_status); + sap_debug("CSR scan_status = eCSR_SCAN_SUCCESS (%d)", scan_status); oper_channel = wlansap_calculate_chan_from_scan_result(mac_handle, sap_ctx, scanid); if (oper_channel == SAP_CHANNEL_NOT_SELECTED) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, - FL("No suitable channel, so select default channel")); + sap_info("No suitable channel, so select default channel"); oper_channel = sap_select_default_oper_chan(mac_ctx, sap_ctx->acs_cfg); } @@ -418,8 +410,7 @@ wlansap_roam_process_ch_change_success(struct mac_context *mac_ctx, /* If SAP is not in starting or started state don't proceed further */ if (sap_ctx->fsm_state == SAP_INIT || sap_ctx->fsm_state == SAP_STOPPING) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, - FL("sapdfs: state [%d] not starting SAP after channel change"), + sap_info("sapdfs: state [%d] not starting SAP after channel change", sap_ctx->fsm_state); return; } @@ -518,9 +509,7 @@ wlansap_roam_process_dfs_chansw_update(mac_handle_t mac_handle, bool sap_scc_dfs; if (mac_ctx->mlme_cfg->dfs_cfg.dfs_disable_channel_switch) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_ERROR, - FL("sapdfs: DFS channel switch disabled")); + sap_err("sapdfs: DFS channel switch disabled"); /* * Send a beacon start request to PE. CSA IE required flag from * beacon template will be cleared by now. A new beacon template @@ -539,15 +528,12 @@ wlansap_roam_process_dfs_chansw_update(mac_handle_t mac_handle, */ if (sap_ctx->fsm_state != SAP_STARTED) { /* Further actions to be taken here */ - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_WARN, - FL("eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND received in (%d) state"), + sap_warn("eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND received in (%d) state", sap_ctx->fsm_state); return; } - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, - FL("sapdfs: from state SAP_STARTED => SAP_STOPPING")); + sap_debug("sapdfs: from state SAP_STARTED => SAP_STOPPING"); sap_ctx->is_chan_change_inprogress = true; /* * The associated stations have been informed to move to a different @@ -625,8 +611,7 @@ wlansap_roam_process_dfs_chansw_update(mac_handle_t mac_handle, */ if (false == is_concurrent_sap_ready_for_channel_change(mac_handle, sap_ctx)) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, - FL("sapdfs: sapctx[%pK] ready but not concurrent sap"), + sap_debug("sapdfs: sapctx[%pK] ready but not concurrent sap", sap_ctx); *ret_status = QDF_STATUS_SUCCESS; return; @@ -640,8 +625,7 @@ wlansap_roam_process_dfs_chansw_update(mac_handle_t mac_handle, && (mac_ctx->sap.sapCtxList[intf].sap_context))) continue; sap_context = mac_ctx->sap.sapCtxList[intf].sap_context; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, - FL("sapdfs:issue chnl change for sapctx[%pK]"), + sap_debug("sapdfs:issue chnl change for sapctx[%pK]", sap_context); sap_get_cac_dur_dfs_region(sap_context, &sap_context->csr_roamProfile.cac_duration_ms, @@ -653,9 +637,7 @@ wlansap_roam_process_dfs_chansw_update(mac_handle_t mac_handle, qdf_status = wlansap_channel_change_request(sap_context, mac_ctx->sap.SapDfsInfo.target_chan_freq); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("post chnl chng req failed, sap[%pK]"), - sap_ctx); + sap_err("post chnl chng req failed, sap[%pK]", sap_ctx); *ret_status = QDF_STATUS_E_FAILURE; } else { sap_context->is_sap_ready_for_chnl_chng = false; @@ -684,20 +666,14 @@ wlansap_roam_process_dfs_radar_found(struct mac_context *mac_ctx, if (sap_is_dfs_cac_wait_state(sap_ctx)) { if (mac_ctx->mlme_cfg->dfs_cfg.dfs_disable_channel_switch) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_ERROR, - "sapdfs: DFS channel switch disabled"); + sap_err("sapdfs: DFS channel switch disabled"); return; } if (false == mac_ctx->sap.SapDfsInfo.sap_radar_found_status) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_ERROR, - "sapdfs: sap_radar_found_status is false"); + sap_err("sapdfs: sap_radar_found_status is false"); return; } - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_INFO_MED, - FL("sapdfs:Posting event eSAP_DFS_CHANNEL_CAC_RADAR_FOUND")); + sap_debug("sapdfs:Posting event eSAP_DFS_CHANNEL_CAC_RADAR_FOUND"); /* * If Radar is found, while in DFS CAC WAIT State then post stop * and destroy the CAC timer and post a @@ -720,8 +696,7 @@ wlansap_roam_process_dfs_radar_found(struct mac_context *mac_ctx, eSAP_DFS_CAC_INTERRUPTED, (void *) eSAP_STATUS_SUCCESS); if (QDF_STATUS_SUCCESS != qdf_status) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("Failed to send CAC end")); + sap_err("Failed to send CAC end"); /* Want to still proceed and try to switch channel. * Lets try not to be on the DFS channel */ @@ -737,8 +712,7 @@ wlansap_roam_process_dfs_radar_found(struct mac_context *mac_ctx, return; } if (sap_ctx->fsm_state == SAP_STARTED) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, - FL("sapdfs:Posting event eSAP_DFS_CHNL_SWITCH_ANNOUNCEMENT_START")); + sap_debug("sapdfs:Posting event eSAP_DFS_CHNL_SWITCH_ANNOUNCEMENT_START"); /* * Radar found on the operating channel in STARTED state, @@ -755,9 +729,8 @@ wlansap_roam_process_dfs_radar_found(struct mac_context *mac_ctx, return; } /* Further actions to be taken here */ - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND received in (%d) state"), - sap_ctx->fsm_state); + sap_err("eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND received in (%d) state", + sap_ctx->fsm_state); return; } @@ -781,8 +754,7 @@ wlansap_roam_process_infra_assoc_ind(struct sap_context *sap_ctx, { QDF_STATUS qdf_status; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND (%d)"), + sap_debug("CSR roam_result = eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND (%d)", roam_result); sap_ctx->nStaWPARSnReqIeLength = csr_roam_info->rsnIELen; if (sap_ctx->nStaWPARSnReqIeLength) @@ -797,15 +769,13 @@ wlansap_roam_process_infra_assoc_ind(struct sap_context *sap_ctx, csr_roam_info, eSAP_STA_ASSOC_IND, (void *) eSAP_STATUS_SUCCESS); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("CSR roam_result = (%d) MAC ("QDF_MAC_ADDR_FMT") fail"), + sap_err("CSR roam_result = (%d) MAC ("QDF_MAC_ADDR_FMT") fail", roam_result, QDF_MAC_ADDR_REF( csr_roam_info->peerMac.bytes)); *ret_status = QDF_STATUS_E_FAILURE; } } else { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN, - FL("CSR roam_result = (%d) MAC ("QDF_MAC_ADDR_FMT") not allowed"), + sap_warn("CSR roam_result = (%d) MAC ("QDF_MAC_ADDR_FMT") not allowed", roam_result, QDF_MAC_ADDR_REF(csr_roam_info->peerMac.bytes)); *ret_status = QDF_STATUS_E_FAILURE; @@ -819,7 +789,7 @@ static void wlansap_update_vendor_acs_chan(struct mac_context *mac_ctx, int intf; if (!mac_ctx) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return; } @@ -838,8 +808,7 @@ static void wlansap_update_vendor_acs_chan(struct mac_context *mac_ctx, return; } /* App failed to provide new channel, try random channel algo */ - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("failed to get channel from userspace")); + sap_warn("Failed to get channel from userspace"); /* Issue stopbss for each sapctx */ for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { @@ -853,10 +822,8 @@ static void wlansap_update_vendor_acs_chan(struct mac_context *mac_ctx, NULL) { sap_context = mac_ctx->sap.sapCtxList[intf].sap_context; - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_ERROR, - FL("sapdfs: no available channel for sapctx[%pK], StopBss"), - sap_context); + sap_err("sapdfs: no available channel for sapctx[%pK], StopBss", + sap_context); wlansap_stop_bss(sap_context); } } @@ -883,21 +850,18 @@ QDF_STATUS wlansap_roam_callback(void *ctx, mac_ctx = sap_get_mac_context(); if (!mac_ctx) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); wlansap_context_put(sap_ctx); return QDF_STATUS_E_NOMEM; } - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("roam_status = %d, roam_result = %d"), - roam_status, roam_result); + sap_debug("CSR roam_status = %s(%d), roam_result = %s(%d)", + get_e_roam_cmd_status_str(roam_status), roam_status, + get_e_csr_roam_result_str(roam_result), roam_result); mac_handle = MAC_HANDLE(mac_ctx); switch (roam_status) { case eCSR_ROAM_INFRA_IND: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR roam_status = eCSR_ROAM_INFRA_IND (%d)"), - roam_status); if (roam_result == eCSR_ROAM_RESULT_INFRA_START_FAILED) { /* Fill in the event structure */ sap_event.event = eSAP_MAC_START_FAILS; @@ -911,46 +875,28 @@ QDF_STATUS wlansap_roam_callback(void *ctx, } break; case eCSR_ROAM_LOSTLINK: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR roam_status = eCSR_ROAM_LOSTLINK (%d)"), - roam_status); break; case eCSR_ROAM_MIC_ERROR_IND: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR roam_status = eCSR_ROAM_MIC_ERROR_IND (%d)"), - roam_status); break; case eCSR_ROAM_SET_KEY_COMPLETE: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR roam_status = eCSR_ROAM_SET_KEY_COMPLETE (%d)"), - roam_status); if (roam_result == eCSR_ROAM_RESULT_FAILURE) sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_STA_SET_KEY_EVENT, (void *) eSAP_STATUS_FAILURE); break; case eCSR_ROAM_ASSOCIATION_COMPLETION: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR roam_status = eCSR_ROAM_ASSOCIATION_COMPLETION (%d)"), - roam_status); if (roam_result == eCSR_ROAM_RESULT_FAILURE) sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_STA_REASSOC_EVENT, (void *) eSAP_STATUS_FAILURE); break; case eCSR_ROAM_DISASSOCIATED: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR roam_status = eCSR_ROAM_DISASSOCIATED (%d)"), - roam_status); if (roam_result == eCSR_ROAM_RESULT_MIC_FAILURE) sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_STA_MIC_FAILURE_EVENT, (void *) eSAP_STATUS_FAILURE); break; case eCSR_ROAM_WPS_PBC_PROBE_REQ_IND: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR roam_status = eCSR_ROAM_WPS_PBC_PROBE_REQ_IND (%d)"), - roam_status); break; case eCSR_ROAM_DISCONNECT_ALL_P2P_CLIENTS: sap_signal_hdd_event(sap_ctx, csr_roam_info, @@ -958,35 +904,29 @@ QDF_STATUS wlansap_roam_callback(void *ctx, (void *) eSAP_STATUS_SUCCESS); break; case eCSR_ROAM_SEND_P2P_STOP_BSS: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("Received stopbss")); + sap_debug("Received stopbss"); sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_MAC_TRIG_STOP_BSS_EVENT, (void *) eSAP_STATUS_SUCCESS); break; case eCSR_ROAM_CHANNEL_COMPLETE_IND: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("Received new channel from app")); + sap_debug("Received new channel from app"); wlansap_update_vendor_acs_chan(mac_ctx, sap_ctx); break; case eCSR_ROAM_DFS_RADAR_IND: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - "Rcvd Radar Indication on sap ch freq %d, session %d", + sap_debug("Rcvd Radar Indication on sap ch freq %d, session %d", sap_ctx->chan_freq, sap_ctx->sessionId); if (!policy_mgr_get_dfs_master_dynamic_enabled( mac_ctx->psoc, sap_ctx->sessionId)) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_DEBUG, - FL("Ignore the Radar indication")); + sap_debug("Ignore the Radar indication"); goto EXIT; } if (sap_ctx->fsm_state != SAP_STARTED && !sap_is_dfs_cac_wait_state(sap_ctx)) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("Ignore Radar event in sap state %d cac wait state %d"), + sap_debug("Ignore Radar event in sap state %d cac wait state %d", sap_ctx->fsm_state, sap_is_dfs_cac_wait_state(sap_ctx)); goto EXIT; @@ -996,15 +936,13 @@ QDF_STATUS wlansap_roam_callback(void *ctx, sap_ctx, wlan_reg_freq_to_chan(mac_ctx->pdev, sap_ctx->chan_freq), PHY_CHANNEL_BONDING_STATE_MAX)) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - "Ignore Radar event for sap ch freq%d", + sap_debug("Ignore Radar event for sap ch freq: %d", sap_ctx->chan_freq); goto EXIT; } if (sap_ctx->is_pre_cac_on) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("sapdfs: Radar detect on pre cac:%d"), + sap_debug("sapdfs: Radar detect on pre cac:%d", sap_ctx->sessionId); if (!sap_ctx->dfs_cac_offload) { qdf_mc_timer_stop( @@ -1020,8 +958,7 @@ QDF_STATUS wlansap_roam_callback(void *ctx, break; } - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, - FL("sapdfs: Indicate eSAP_DFS_RADAR_DETECT to HDD")); + sap_debug("sapdfs: Indicate eSAP_DFS_RADAR_DETECT to HDD"); sap_signal_hdd_event(sap_ctx, NULL, eSAP_DFS_RADAR_DETECT, (void *) eSAP_STATUS_SUCCESS); mac_ctx->sap.SapDfsInfo.target_chan_freq = @@ -1073,20 +1010,16 @@ QDF_STATUS wlansap_roam_callback(void *ctx, } break; case eCSR_ROAM_DFS_CHAN_SW_NOTIFY: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("Received Chan Sw Update Notification")); + sap_debug("Received Chan Sw Update Notification"); break; case eCSR_ROAM_SET_CHANNEL_RSP: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("Received set channel response")); + sap_debug("Received set channel response"); break; case eCSR_ROAM_CAC_COMPLETE_IND: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("Received cac complete indication")); + sap_debug("Received cac complete indication"); break; case eCSR_ROAM_EXT_CHG_CHNL_IND: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("Received set channel Indication")); + sap_debug("Received set channel Indication"); break; default: break; @@ -1101,14 +1034,10 @@ QDF_STATUS wlansap_roam_callback(void *ctx, break; case eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF: if (!csr_roam_info) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "csr_roam_info is NULL"); + sap_err("csr_roam_info is NULL"); qdf_ret_status = QDF_STATUS_E_NULL_VALUE; break; } - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF (%d)"), - roam_result); sap_ctx->nStaWPARSnReqIeLength = csr_roam_info->rsnIELen; if (sap_ctx->nStaWPARSnReqIeLength) qdf_mem_copy(sap_ctx->pStaWpaRsnReqIE, @@ -1124,9 +1053,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx, break; case eCSR_ROAM_RESULT_DEAUTH_IND: case eCSR_ROAM_RESULT_DISASSOC_IND: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR roam_result = eCSR_ROAM_RESULT_DEAUTH/DISASSOC_IND (%d)"), - roam_result); /* Fill in the event structure */ qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_STA_DISASSOC_EVENT, @@ -1135,9 +1061,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx, qdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_MIC_ERROR_GROUP: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR roam_result = eCSR_ROAM_RESULT_MIC_ERROR_GROUP (%d)"), - roam_result); /* * Fill in the event structure * TODO: support for group key MIC failure event to be handled @@ -1149,9 +1072,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx, qdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_MIC_ERROR_UNICAST: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR roam_result = eCSR_ROAM_RESULT_MIC_ERROR_UNICAST (%d)"), - roam_result); /* * Fill in the event structure * TODO: support for unicast key MIC failure event to be handled @@ -1165,9 +1085,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx, } break; case eCSR_ROAM_RESULT_AUTHENTICATED: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR roam_result = eCSR_ROAM_RESULT_AUTHENTICATED (%d)"), - roam_result); /* Fill in the event structure */ sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_STA_SET_KEY_EVENT, @@ -1176,9 +1093,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx, qdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_ASSOCIATED: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR roam_result = eCSR_ROAM_RESULT_ASSOCIATED (%d)"), - roam_result); /* Fill in the event structure */ sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_STA_REASSOC_EVENT, @@ -1186,14 +1100,10 @@ QDF_STATUS wlansap_roam_callback(void *ctx, break; case eCSR_ROAM_RESULT_INFRA_STARTED: if (!csr_roam_info) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "csr_roam_info is NULL"); + sap_err("csr_roam_info is NULL"); qdf_ret_status = QDF_STATUS_E_NULL_VALUE; break; } - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_STARTED (%d)"), - roam_result); /* * In the current implementation, hostapd is not aware that * drive will support DFS. Hence, driver should inform @@ -1210,9 +1120,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx, qdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_INFRA_STOPPED: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_STOPPED (%d)"), - roam_result); /* Fill in the event structure */ sap_event.event = eSAP_MAC_READY_FOR_CONNECTIONS; sap_event.params = csr_roam_info; @@ -1224,9 +1131,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx, qdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR roam_result = eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND (%d)"), - roam_result); /* * Fill in the event structure * TODO: support for group key MIC failure event to be handled @@ -1238,9 +1142,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx, qdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_FORCED: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR roam_result = eCSR_ROAM_RESULT_FORCED (%d)"), - roam_result); /* * This event can be used to inform hdd about user triggered * disassoc event @@ -1251,9 +1152,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx, (void *) eSAP_STATUS_SUCCESS); break; case eCSR_ROAM_RESULT_NONE: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR roam_result = eCSR_ROAM_RESULT_NONE (%d)"), - roam_result); /* * This event can be used to inform hdd about user triggered * disassoc event @@ -1265,9 +1163,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx, (void *) eSAP_STATUS_SUCCESS); break; case eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR roam_result = eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED (%d)"), - roam_result); /* Fill in the event structure */ qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_MAX_ASSOC_EXCEEDED, @@ -1287,8 +1182,7 @@ QDF_STATUS wlansap_roam_callback(void *ctx, qdf_ret_status = wlansap_dfs_send_csa_ie_request(sap_ctx); if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("CSR roam_result = eCSR_ROAM_RESULT_CSA_RESTART_RSP %d"), + sap_debug("CSR roam_result = eCSR_ROAM_RESULT_CSA_RESTART_RSP %d", roam_result); break; case eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_SUCCESS: @@ -1332,10 +1226,9 @@ QDF_STATUS wlansap_roam_callback(void *ctx, qdf_ret_status = QDF_STATUS_E_FAILURE; break; default: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("CSR roam_result = %s (%d) not handled"), - get_e_csr_roam_result_str(roam_result), - roam_result); + sap_err("CSR roam_result = %s (%d) not handled", + get_e_csr_roam_result_str(roam_result), + roam_result); break; } EXIT: @@ -1372,8 +1265,7 @@ void sap_scan_event_callback(struct wlan_objmgr_vdev *vdev, scan_id = event->scan_id; mac_handle = cds_get_context(QDF_MODULE_ID_SME); if (!mac_handle) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL, - FL("invalid MAC handle")); + sap_alert("invalid MAC handle"); return; } diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c index ee8bdaf3200f..3ea5b8755d82 100644 --- a/core/sap/src/sap_ch_select.c +++ b/core/sap/src/sap_ch_select.c @@ -457,9 +457,7 @@ static bool sap_chan_sel_init(mac_handle_t mac_handle, if (sap_dfs_is_channel_in_nol_list( sap_ctx, channel, PHY_SINGLE_CHANNEL_CENTERED)) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "In %s, Ch %d is in NOL list", __func__, - channel); + sap_debug("Ch %d is in NOL list", channel); continue; } @@ -467,11 +465,9 @@ static bool sap_chan_sel_init(mac_handle_t mac_handle, sta_sap_scc_on_dfs_chnl_config_value == 1) { if (wlan_reg_is_dfs_for_freq(mac->pdev, pSpectCh->chan_freq)) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_INFO_HIGH, - "In %s, DFS Ch %d not considered for ACS. include_dfs_ch %u, sta_sap_scc_on_dfs_chnl_config_value %d", - __func__, channel, include_dfs_ch, - sta_sap_scc_on_dfs_chnl_config_value); + sap_debug("DFS Ch %d not considered for ACS. include_dfs_ch %u, sta_sap_scc_on_dfs_chnl_config_value %d", + channel, include_dfs_ch, + sta_sap_scc_on_dfs_chnl_config_value); continue; } } @@ -560,8 +556,7 @@ uint32_t sapweight_rssi_count(struct sap_context *sap_ctx, int8_t rssi, rssicountWeight = rssiWeight + countWeight; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "rssiWeight=%d, countWeight=%d, rssicountWeight=%d", + sap_debug("rssiWeight=%d, countWeight=%d, rssicountWeight=%d", rssiWeight, countWeight, rssicountWeight); return rssicountWeight; @@ -628,8 +623,7 @@ static uint32_t sap_weight_channel_noise_floor(struct sap_context *sap_ctx, if (noise_floor_weight > softap_nf_weight_local) noise_floor_weight = softap_nf_weight_local; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "nf=%d, nfwc=%d, nfwl=%d, nfw=%d", + sap_debug("nf=%d, nfwc=%d, nfwl=%d, nfw=%d", channel_stat->noise_floor, softap_nf_weight_cfg, softap_nf_weight_local, noise_floor_weight); @@ -684,8 +678,7 @@ static uint32_t sap_weight_channel_free(struct sap_context *sap_ctx, if (channel_free_weight > softap_channel_free_weight_local) channel_free_weight = softap_channel_free_weight_local; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "rcc=%d, cc=%d, tc=%d, rc=%d, cfwc=%d, cfwl=%d, cfw=%d", + sap_debug("rcc=%d, cc=%d, tc=%d, rc=%d, cfwc=%d, cfwl=%d, cfw=%d", rx_clear_count, cycle_count, channel_stat->tx_frame_count, channel_stat->rx_frame_count, @@ -734,8 +727,7 @@ static uint32_t sap_weight_channel_txpwr_range(struct sap_context *sap_ctx, if (txpwr_weight_low_speed > softap_txpwr_range_weight_local) txpwr_weight_low_speed = softap_txpwr_range_weight_local; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "tpr=%d, tprwc=%d, tprwl=%d, tprw=%d", + sap_debug("tpr=%d, tprwc=%d, tprwl=%d, tprw=%d", channel_stat->chan_tx_pwr_range, softap_txpwr_range_weight_cfg, softap_txpwr_range_weight_local, @@ -782,8 +774,7 @@ static uint32_t sap_weight_channel_txpwr_tput(struct sap_context *sap_ctx, if (txpwr_weight_high_speed > softap_txpwr_tput_weight_local) txpwr_weight_high_speed = softap_txpwr_tput_weight_local; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "tpt=%d, tptwc=%d, tptwl=%d, tptw=%d", + sap_debug("tpt=%d, tptwc=%d, tptwl=%d, tptw=%d", channel_stat->chan_tx_pwr_throughput, softap_txpwr_tput_weight_cfg, softap_txpwr_tput_weight_local, @@ -1034,8 +1025,7 @@ static void sap_interference_rssi_count(tSapSpectChInfo *spect_ch, tSapSpectChInfo *spectch_end) { if (!spect_ch) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "%s: spect_ch is NULL", __func__); + sap_err("spect_ch is NULL"); return; } @@ -1297,8 +1287,7 @@ static void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams, mac->mlme_cfg->acs.normalize_weight_range; bool freq_present_in_list = false; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "In %s, Computing spectral weight", __func__); + sap_debug("Computing spectral weight"); if (scan_list) qdf_list_peek_front(scan_list, &cur_lst); @@ -2247,8 +2236,7 @@ uint32_t sap_select_channel(mac_handle_t mac_handle, /* Initialize the structure pointed by spect_info */ if (sap_chan_sel_init(mac_handle, spect_info, sap_ctx) != true) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("Ch Select initialization failed")); + sap_err("Ch Select initialization failed"); return SAP_CHANNEL_NOT_SELECTED; } diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index 1b8abd12e7d2..5e9feaa70d0f 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -196,14 +196,13 @@ static qdf_freq_t sap_random_channel_sel(struct sap_context *sap_ctx) mac_ctx = sap_get_mac_context(); if (!mac_ctx) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return 0; } pdev = mac_ctx->pdev; if (!pdev) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("null pdev")); + sap_err("null pdev"); return 0; } @@ -240,8 +239,7 @@ static qdf_freq_t sap_random_channel_sel(struct sap_context *sap_ctx) pdev, sap_ctx->vdev, flag, ch_params, &hw_mode, &chan_freq, &acs_info))) { /* No available channel found */ - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("No available channel found!!!")); + sap_err("No available channel found!!!"); sap_signal_hdd_event(sap_ctx, NULL, eSAP_DFS_NO_AVAILABLE_CHANNEL, (void *)eSAP_STATUS_SUCCESS); @@ -428,36 +426,32 @@ void sap_get_cac_dur_dfs_region(struct sap_context *sap_ctx, struct mac_context *mac; if (!sap_ctx) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "%s: null sap_ctx", __func__); + sap_err("null sap_ctx"); return; } mac = sap_get_mac_context(); if (!mac) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return; } wlan_reg_get_dfs_region(mac->pdev, dfs_region); if (mac->sap.SapDfsInfo.ignore_cac) { *cac_duration_ms = 0; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - "%s: ignore_cac is set", __func__); + sap_debug("ignore_cac is set"); return; } *cac_duration_ms = DEFAULT_CAC_TIMEOUT; if (*dfs_region != DFS_ETSI_REGION) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("sapdfs: default cac duration")); + sap_debug("sapdfs: default cac duration"); return; } if (sap_is_channel_bonding_etsi_weather_channel(sap_ctx)) { *cac_duration_ms = ETSI_WEATHER_CH_CAC_TIMEOUT; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("sapdfs: bonding_etsi_weather_channel")); + sap_debug("sapdfs: bonding_etsi_weather_channel"); return; } @@ -466,8 +460,7 @@ void sap_get_cac_dur_dfs_region(struct sap_context *sap_ctx, for (i = 0; i < num_channels; i++) { if (IS_ETSI_WEATHER_CH(channels[i])) { *cac_duration_ms = ETSI_WEATHER_CH_CAC_TIMEOUT; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("sapdfs: ch=%d is etsi weather channel"), + sap_debug("sapdfs: ch=%d is etsi weather channel", channels[i]); return; } @@ -488,21 +481,19 @@ void sap_dfs_set_current_channel(void *ctx) mac_ctx = sap_get_mac_context(); if (!mac_ctx) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return; } pdev = mac_ctx->pdev; if (!pdev) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("null pdev")); + sap_err("null pdev"); return; } is_dfs = wlan_reg_is_dfs_for_freq(pdev, sap_ctx->chan_freq); - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("freq=%d, dfs %d seg0=%d, seg1=%d, bw %d"), + sap_debug("freq=%d, dfs %d seg0=%d, seg1=%d, bw %d", sap_ctx->chan_freq, is_dfs, vht_seg0, vht_seg1, sap_ctx->csr_roamProfile.ch_params.ch_width); @@ -580,14 +571,13 @@ sap_dfs_is_channel_in_nol_list(struct sap_context *sap_context, mac_ctx = sap_get_mac_context(); if (!mac_ctx) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return false; } pdev = mac_ctx->pdev; if (!pdev) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("null pdev")); + sap_err("null pdev"); return false; } @@ -607,8 +597,7 @@ sap_dfs_is_channel_in_nol_list(struct sap_context *sap_context, ch_state = wlan_reg_get_channel_state(pdev, channels[i]); if (CHANNEL_STATE_ENABLE != ch_state && CHANNEL_STATE_DFS != ch_state) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("Invalid ch num=%d, ch state=%d"), + sap_err("Invalid ch num=%d, ch state=%d", channels[i], ch_state); return true; } @@ -630,14 +619,13 @@ sap_chan_bond_dfs_sub_chan(struct sap_context *sap_context, mac_ctx = sap_get_mac_context(); if (!mac_ctx) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return false; } pdev = mac_ctx->pdev; if (!pdev) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("null pdev")); + sap_err("null pdev"); return false; } @@ -657,8 +645,7 @@ sap_chan_bond_dfs_sub_chan(struct sap_context *sap_context, for (i = 0; i < num_channels; i++) { if (wlan_reg_chan_has_dfs_attribute(pdev, channels[i])) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("sub ch num=%d is dfs in %d"), + sap_debug("sub ch num=%d is dfs in %d", channels[i], channel_number); return true; } @@ -746,14 +733,12 @@ sap_validate_chan(struct sap_context *sap_context, mac_ctx = MAC_CONTEXT(mac_handle); if (!mac_ctx) { /* we have a serious problem */ - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL, - FL("invalid MAC handle")); + sap_alert("invalid MAC handle"); return QDF_STATUS_E_FAULT; } if (!sap_context->chan_freq) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("Invalid channel")); + sap_err("Invalid channel"); return QDF_STATUS_E_FAILURE; } go_force_scc = policy_mgr_go_scc_enforced(mac_ctx->psoc); @@ -768,8 +753,7 @@ sap_validate_chan(struct sap_context *sap_context, #ifdef FEATURE_WLAN_STA_AP_MODE_DFS_DISABLE if (wlan_reg_is_dfs_for_freq(mac_ctx->pdev, sap_context->chan_freq)) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN, - FL("DFS not supported in STA_AP Mode")); + sap_warn("DFS not supported in STA_AP Mode"); return QDF_STATUS_E_ABORTED; } #endif @@ -781,8 +765,7 @@ sap_validate_chan(struct sap_context *sap_context, sap_context->chan_freq, sap_context->csr_roamProfile.phyMode, sap_context->cc_switch_mode); - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("After check overlap: con_ch:%d"), + sap_debug("After check overlap: con_ch:%d", con_ch_freq); ch_params = sap_context->ch_params; if (con_ch_freq && @@ -797,14 +780,11 @@ sap_validate_chan(struct sap_context *sap_context, sap_context->chan_freq, sap_context->sessionId, &ch_params))) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_WARN, - FL("SAP can't start (no MCC)")); + sap_warn("SAP can't start (no MCC)"); return QDF_STATUS_E_ABORTED; } } - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("After check concurrency: con_ch:%d"), + sap_debug("After check concurrency: con_ch:%d", con_ch_freq); sta_sap_scc_on_dfs_chan = policy_mgr_is_sta_sap_scc_allowed_on_dfs_chan( @@ -822,10 +802,8 @@ sap_validate_chan(struct sap_context *sap_context, mac_ctx->pdev, &ch_params, con_ch_freq) || sta_sap_scc_on_dfs_chan)) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_DEBUG, - "%s: Override ch freq %d to %d due to CC Intf", - __func__, sap_context->chan_freq, + sap_debug("Override ch freq %d to %d due to CC Intf", + sap_context->chan_freq, con_ch_freq); sap_context->chan_freq = con_ch_freq; if (WLAN_REG_IS_24GHZ_CH_FREQ( @@ -842,8 +820,7 @@ sap_validate_chan(struct sap_context *sap_context, #endif } validation_done: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("for configured channel, Ch_freq = %d"), + sap_debug("for configured channel, Ch_freq = %d", sap_context->chan_freq); if (check_for_connection_update) { @@ -860,9 +837,8 @@ validation_done: } if (pre_start_bss) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, - FL("ACS end due to Ch override. Sel Ch freq = %d"), - sap_context->chan_freq); + sap_info("ACS end due to Ch override. Sel Ch freq = %d", + sap_context->chan_freq); sap_context->acs_cfg->pri_ch_freq = sap_context->chan_freq; sap_context->acs_cfg->ch_width = sap_context->ch_width_orig; @@ -891,15 +867,13 @@ QDF_STATUS sap_channel_sel(struct sap_context *sap_context) mac_handle = cds_get_context(QDF_MODULE_ID_SME); if (!mac_handle) { /* we have a serious problem */ - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL, - FL("invalid mac_handle")); + sap_alert("invalid mac_handle"); return QDF_STATUS_E_FAULT; } mac_ctx = MAC_CONTEXT(mac_handle); if (!mac_ctx) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("Invalid MAC context")); + sap_err("Invalid MAC context"); return QDF_STATUS_E_FAILURE; } if (sap_context->fsm_state != SAP_STARTED && sap_context->chan_freq) @@ -932,8 +906,7 @@ QDF_STATUS sap_channel_sel(struct sap_context *sap_context) #endif } #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("%s skip_acs_status = %d "), __func__, + sap_debug("skip_acs_status = %d", sap_context->acs_cfg->skip_scan_status); if (sap_context->acs_cfg->skip_scan_status != eSAP_SKIP_ACS_SCAN) { @@ -962,8 +935,7 @@ QDF_STATUS sap_channel_sel(struct sap_context *sap_context) vdev_id, WLAN_LEGACY_SME_ID); if (!vdev) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("Invalid vdev objmgr")); + sap_err("Invalid vdev objmgr"); qdf_mem_free(freq_list); qdf_mem_free(req); return QDF_STATUS_E_INVAL; @@ -989,11 +961,8 @@ QDF_STATUS sap_channel_sel(struct sap_context *sap_context) sap_context->acs_req_timestamp = qdf_get_time_of_the_day_ms(); qdf_ret_status = ucfg_scan_start(req); if (qdf_ret_status != QDF_STATUS_SUCCESS) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("scan request fail %d!!!"), - qdf_ret_status); - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("SAP Configuring default ch, Ch_freq=%d"), + sap_err("scan request fail %d!!!", qdf_ret_status); + sap_info("SAP Configuring default ch, Ch_freq=%d", sap_context->chan_freq); default_op_freq = sap_select_default_oper_chan( mac_ctx, sap_context->acs_cfg); @@ -1023,9 +992,8 @@ QDF_STATUS sap_channel_sel(struct sap_context *sap_context) } if (sap_context->acs_cfg->skip_scan_status == eSAP_SKIP_ACS_SCAN) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("## %s SKIPPED ACS SCAN"), __func__); - wlansap_pre_start_bss_acs_scan_callback(mac_handle, + sap_err("## SKIPPED ACS SCAN"); + wlansap_pre_start_bss_acs_scan_callback(mac_handle, sap_context, sap_context->sessionId, 0, eCSR_SCAN_SUCCESS); } @@ -1078,8 +1046,7 @@ static QDF_STATUS sap_clear_global_dfs_param(mac_handle_t mac_handle) sap_ctx = sap_find_valid_concurrent_session(mac_handle); if (sap_ctx && WLAN_REG_IS_5GHZ_CH_FREQ(sap_ctx->chan_freq)) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - "conc session exists, no need to clear dfs struct"); + sap_debug("conc session exists, no need to clear dfs struct"); return QDF_STATUS_SUCCESS; } /* @@ -1107,16 +1074,14 @@ QDF_STATUS sap_acquire_vdev_ref(struct wlan_objmgr_psoc *psoc, struct wlan_objmgr_vdev *vdev; if (sap_ctx->vdev) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("Invalid vdev obj in sap context")); + sap_err("Invalid vdev obj in sap context"); return QDF_STATUS_E_FAULT; } vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc, session_id, WLAN_LEGACY_SAP_ID); if (!vdev) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("vdev is NULL for vdev_id: %u"), session_id); + sap_err("vdev is NULL for vdev_id: %u", session_id); return QDF_STATUS_E_FAILURE; } @@ -1161,9 +1126,8 @@ QDF_STATUS sap_set_session_param(mac_handle_t mac_handle, mac_ctx->sap.sapCtxList[sapctx->sessionId].sap_context = sapctx; mac_ctx->sap.sapCtxList[sapctx->sessionId].sapPersona = sapctx->csr_roamProfile.csrPersona; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - "%s: Initializing sap_ctx = %pK with session = %d", __func__, - sapctx, session_id); + sap_debug("Initializing sap_ctx = %pK with session = %d", + sapctx, session_id); return QDF_STATUS_SUCCESS; } @@ -1203,16 +1167,14 @@ static QDF_STATUS sap_goto_stopping(struct sap_context *sap_ctx) mac_ctx = sap_get_mac_context(); if (!mac_ctx) { /* we have a serious problem */ - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return QDF_STATUS_E_FAULT; } sap_free_roam_profile(&sap_ctx->csr_roamProfile); status = sme_roam_stop_bss(MAC_HANDLE(mac_ctx), sap_ctx->sessionId); if (status != QDF_STATUS_SUCCESS) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "Error: In %s calling sme_roam_stop_bss status = %d", - __func__, status); + sap_err("Calling sme_roam_stop_bss status = %d", status); return QDF_STATUS_E_FAILURE; } @@ -1295,7 +1257,7 @@ static bool sap_fill_owe_ie_in_assoc_ind(tSap_StationAssocIndication *assoc_ind, const uint8_t *rsn_ie, *dh_ie; if (assoc_ind->assocReqLength < ASSOC_REQ_IE_OFFSET) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid assoc req"); + sap_err("Invalid assoc req"); return false; } @@ -1303,14 +1265,13 @@ static bool sap_fill_owe_ie_in_assoc_ind(tSap_StationAssocIndication *assoc_ind, assoc_ind->assocReqPtr + ASSOC_REQ_IE_OFFSET, assoc_ind->assocReqLength - ASSOC_REQ_IE_OFFSET); if (!rsn_ie) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "RSN IE is not present"); + sap_err("RSN IE is not present"); return false; } rsn_ie_len = rsn_ie[1] + 2; if (rsn_ie_len < DOT11F_IE_RSN_MIN_LEN || rsn_ie_len > DOT11F_IE_RSN_MAX_LEN) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid RSN IE len %d", - rsn_ie_len); + sap_err("Invalid RSN IE len %d", rsn_ie_len); return false; } @@ -1318,19 +1279,17 @@ static bool sap_fill_owe_ie_in_assoc_ind(tSap_StationAssocIndication *assoc_ind, assoc_ind->assocReqPtr + ASSOC_REQ_IE_OFFSET, (uint16_t)(assoc_ind->assocReqLength - ASSOC_REQ_IE_OFFSET)); if (!dh_ie) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "DH IE is not present"); + sap_err("DH IE is not present"); return false; } dh_ie_len = dh_ie[1] + 2; if (dh_ie_len < DOT11F_IE_DH_PARAMETER_ELEMENT_MIN_LEN || dh_ie_len > DOT11F_IE_DH_PARAMETER_ELEMENT_MAX_LEN) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid DH IE len %d", - dh_ie_len); + sap_err("Invalid DH IE len %d", dh_ie_len); return false; } - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, - FL("rsn_ie_len = %d, dh_ie_len = %d"), rsn_ie_len, dh_ie_len); + sap_debug("rsn_ie_len = %d, dh_ie_len = %d", rsn_ie_len, dh_ie_len); owe_ie_len = rsn_ie_len + dh_ie_len; assoc_ind->owe_ie = qdf_mem_malloc(owe_ie_len); @@ -1408,19 +1367,17 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx, mac_ctx = sap_get_mac_context(); if (!mac_ctx) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return QDF_STATUS_E_FAILURE; } - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("SAP event callback event = %s"), + sap_debug("SAP event callback event = %s", sap_hdd_event_to_string(sap_hddevent)); switch (sap_hddevent) { case eSAP_STA_ASSOC_IND: if (!csr_roaminfo) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("Invalid CSR Roam Info")); + sap_debug("Invalid CSR Roam Info"); return QDF_STATUS_E_INVAL; } /* TODO - Indicate the assoc request indication to OS */ @@ -1449,9 +1406,7 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx, if (csr_roaminfo->owe_pending_assoc_ind) { if (!sap_fill_owe_ie_in_assoc_ind(assoc_ind, csr_roaminfo->owe_pending_assoc_ind)) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_ERROR, - FL("Failed to fill OWE IE")); + sap_err("Failed to fill OWE IE"); qdf_mem_free(csr_roaminfo-> owe_pending_assoc_ind); csr_roaminfo->owe_pending_assoc_ind = NULL; @@ -1459,9 +1414,7 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx, } if (!sap_save_owe_pending_assoc_ind(sap_ctx, csr_roaminfo->owe_pending_assoc_ind)) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_ERROR, - FL("Failed to save assoc ind")); + sap_err("Failed to save assoc ind"); qdf_mem_free(csr_roaminfo-> owe_pending_assoc_ind); csr_roaminfo->owe_pending_assoc_ind = NULL; @@ -1476,16 +1429,14 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx, bss_complete->sessionId = sap_ctx->sessionId; if (bss_complete->sessionId == WLAN_UMAC_VDEV_ID_MAX) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("Invalid sessionId")); + sap_err("Invalid sessionId"); return QDF_STATUS_E_INVAL; } bss_complete->status = (eSapStatus) context; bss_complete->staId = sap_ctx->sap_sta_id; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("(eSAP_START_BSS_EVENT): staId = %d"), + sap_info("(eSAP_START_BSS_EVENT): staId = %d", bss_complete->staId); bss_complete->operating_chan_freq = sap_ctx->chan_freq; @@ -1534,13 +1485,11 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx, case eSAP_STA_REASSOC_EVENT: if (!csr_roaminfo) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("Invalid CSR Roam Info")); + sap_err("Invalid CSR Roam Info"); return QDF_STATUS_E_INVAL; } if (sap_ctx->fsm_state == SAP_STOPPING) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "SAP is stopping, not able to handle any incoming (re)assoc req"); + sap_err("SAP is stopping, not able to handle any incoming (re)assoc req"); return QDF_STATUS_E_ABORTED; } @@ -1558,9 +1507,8 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx, reassoc_complete->status_code = csr_roaminfo->status_code; if (csr_roaminfo->assocReqLength < ASSOC_REQ_IE_OFFSET) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("Invalid assoc request length:%d"), - csr_roaminfo->assocReqLength); + sap_err("Invalid assoc request length:%d", + csr_roaminfo->assocReqLength); return QDF_STATUS_E_INVAL; } reassoc_complete->ies_len = (csr_roaminfo->assocReqLength - @@ -1628,8 +1576,7 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx, case eSAP_STA_DISASSOC_EVENT: if (!csr_roaminfo) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("Invalid CSR Roam Info")); + sap_debug("Invalid CSR Roam Info"); return QDF_STATUS_E_INVAL; } sap_ap_event.sapHddEventCode = eSAP_STA_DISASSOC_EVENT; @@ -1657,8 +1604,7 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx, case eSAP_STA_SET_KEY_EVENT: if (!csr_roaminfo) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("Invalid CSR Roam Info")); + sap_debug("Invalid CSR Roam Info"); return QDF_STATUS_E_INVAL; } sap_ap_event.sapHddEventCode = eSAP_STA_SET_KEY_EVENT; @@ -1672,8 +1618,7 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx, case eSAP_STA_MIC_FAILURE_EVENT: if (!csr_roaminfo) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("Invalid CSR Roam Info")); + sap_debug("Invalid CSR Roam Info"); return QDF_STATUS_E_INVAL; } sap_ap_event.sapHddEventCode = eSAP_STA_MIC_FAILURE_EVENT; @@ -1700,8 +1645,7 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx, case eSAP_WPS_PBC_PROBE_REQ_EVENT: if (!csr_roaminfo) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("Invalid CSR Roam Info")); + sap_debug("Invalid CSR Roam Info"); return QDF_STATUS_E_INVAL; } sap_ap_event.sapHddEventCode = eSAP_WPS_PBC_PROBE_REQ_EVENT; @@ -1733,8 +1677,7 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx, case eSAP_MAX_ASSOC_EXCEEDED: if (!csr_roaminfo) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("Invalid CSR Roam Info")); + sap_debug("Invalid CSR Roam Info"); return QDF_STATUS_E_INVAL; } sap_ap_event.sapHddEventCode = eSAP_MAX_ASSOC_EXCEEDED; @@ -1770,30 +1713,26 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx, case eSAP_ECSA_CHANGE_CHAN_IND: if (!csr_roaminfo) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("Invalid CSR Roam Info")); + sap_debug("Invalid CSR Roam Info"); return QDF_STATUS_E_INVAL; } - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "In %s, SAP event callback event = %s", - __func__, "eSAP_ECSA_CHANGE_CHAN_IND"); + sap_debug("SAP event callback event = %s", + "eSAP_ECSA_CHANGE_CHAN_IND"); sap_ap_event.sapHddEventCode = eSAP_ECSA_CHANGE_CHAN_IND; sap_ap_event.sapevt.sap_chan_cng_ind.new_chan_freq = csr_roaminfo->target_chan_freq; break; case eSAP_DFS_NEXT_CHANNEL_REQ: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "In %s, SAP event callback event = %s", - __func__, "eSAP_DFS_NEXT_CHANNEL_REQ"); + sap_debug("SAP event callback event = %s", + "eSAP_DFS_NEXT_CHANNEL_REQ"); sap_ap_event.sapHddEventCode = eSAP_DFS_NEXT_CHANNEL_REQ; break; case eSAP_STOP_BSS_DUE_TO_NO_CHNL: sap_ap_event.sapHddEventCode = eSAP_STOP_BSS_DUE_TO_NO_CHNL; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("stopping session_id:%d, bssid:"QDF_MAC_ADDR_FMT", chan_freq:%d"), - sap_ctx->sessionId, - QDF_MAC_ADDR_REF(sap_ctx->self_mac_addr), - sap_ctx->chan_freq); + sap_debug("stopping session_id:%d, bssid:"QDF_MAC_ADDR_FMT", chan_freq:%d", + sap_ctx->sessionId, + QDF_MAC_ADDR_REF(sap_ctx->self_mac_addr), + sap_ctx->chan_freq); break; case eSAP_CHANNEL_CHANGE_RESP: @@ -1807,15 +1746,12 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx, sap_ctx->csr_roamProfile.ch_params.mhz_freq_seg0; acs_selected->vht_seg1_center_ch_freq = sap_ctx->csr_roamProfile.ch_params.mhz_freq_seg1; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "In %s, SAP event callback event = %s", - __func__, "eSAP_CHANNEL_CHANGE_RESP"); + sap_debug("SAP event callback event = %s", + "eSAP_CHANNEL_CHANGE_RESP"); break; default: - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("SAP Unknown callback event = %d"), - sap_hddevent); + sap_err("SAP Unknown callback event = %d", sap_hddevent); break; } qdf_status = (*sap_ctx->sap_event_cb) @@ -1877,22 +1813,17 @@ static struct sap_context *sap_find_cac_wait_session(mac_handle_t handle) uint8_t i = 0; struct sap_context *sap_ctx; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, - "%s", __func__); - for (i = 0; i < SAP_MAX_NUM_SESSION; i++) { sap_ctx = mac->sap.sapCtxList[i].sap_context; if (((QDF_SAP_MODE == mac->sap.sapCtxList[i].sapPersona) || (QDF_P2P_GO_MODE == mac->sap.sapCtxList[i].sapPersona)) && (sap_is_dfs_cac_wait_state(sap_ctx))) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, - "%s: found SAP in cac wait state", __func__); + sap_debug("found SAP in cac wait state"); return sap_ctx; } if (sap_ctx) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, - "sapdfs: mode:%d intf:%d state:%d", + sap_debug("sapdfs: mode:%d intf:%d state:%d", mac->sap.sapCtxList[i].sapPersona, i, sap_ctx->fsm_state); } @@ -1951,8 +1882,7 @@ static QDF_STATUS sap_cac_start_notify(mac_handle_t mac_handle) if (!wlan_reg_is_dfs_for_freq(mac->pdev, ch_freq)) continue; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, - "sapdfs: Signaling eSAP_DFS_CAC_START to HDD for sapctx[%pK]", + sap_debug("sapdfs: Signaling eSAP_DFS_CAC_START to HDD for sapctx[%pK]", sap_context); qdf_status = sap_signal_hdd_event(sap_context, NULL, @@ -1960,10 +1890,8 @@ static QDF_STATUS sap_cac_start_notify(mac_handle_t mac_handle) (void *) eSAP_STATUS_SUCCESS); if (QDF_STATUS_SUCCESS != qdf_status) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_ERROR, - "In %s, failed setting isCacStartNotified on interface[%d]", - __func__, intf); + sap_err("Failed setting isCacStartNotified on interface[%d]", + intf); return qdf_status; } sap_context->isCacStartNotified = true; @@ -1991,17 +1919,12 @@ static QDF_STATUS wlansap_update_pre_cac_end(struct sap_context *sap_context, mac->sap.SapDfsInfo.sap_radar_found_status = false; sap_context->fsm_state = SAP_STARTED; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "In %s, pre cac end notify on %d: move to state SAP_STARTED", - __func__, intf); + sap_warn("pre cac end notify on %d: move to state SAP_STARTED", intf); qdf_status = sap_signal_hdd_event(sap_context, NULL, eSAP_DFS_PRE_CAC_END, (void *)eSAP_STATUS_SUCCESS); if (QDF_IS_STATUS_ERROR(qdf_status)) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_ERROR, - "In %s, pre cac notify failed on intf %d", - __func__, intf); + sap_err("pre cac notify failed on intf %d", intf); return qdf_status; } @@ -2073,16 +1996,13 @@ static QDF_STATUS sap_cac_end_notify(mac_handle_t mac_handle, (void *) eSAP_STATUS_SUCCESS); if (QDF_STATUS_SUCCESS != qdf_status) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_ERROR, - "In %s, failed setting isCacEndNotified on interface[%d]", - __func__, intf); + sap_err("failed setting isCacEndNotified on interface[%d]", + intf); return qdf_status; } sap_context->isCacEndNotified = true; mac->sap.SapDfsInfo.sap_radar_found_status = false; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, - "sapdfs: Start beacon request on sapctx[%pK]", + sap_debug("sapdfs: Start beacon request on sapctx[%pK]", sap_context); /* Start beaconing on the new channel */ @@ -2091,8 +2011,7 @@ static QDF_STATUS sap_cac_end_notify(mac_handle_t mac_handle, /* Transition from SAP_STARTING to SAP_STARTED * (both without substates) */ - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, - "sapdfs: chan_freq[%d] from state %s => %s", + sap_debug("sapdfs: chan_freq[%d] from state %s => %s", sap_context->chan_freq, "SAP_STARTING", "SAP_STARTED"); @@ -2104,10 +2023,8 @@ static QDF_STATUS sap_cac_end_notify(mac_handle_t mac_handle, (void *) eSAP_STATUS_SUCCESS); if (QDF_STATUS_SUCCESS != qdf_status) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_ERROR, - "In %s, failed setting isCacEndNotified on interface[%d]", - __func__, intf); + sap_err("Failed setting isCacEndNotified on interface[%d]", + intf); return qdf_status; } } @@ -2165,17 +2082,14 @@ static QDF_STATUS sap_validate_dfs_nol(struct sap_context *sap_ctx, chan_freq = sap_random_channel_sel(sap_ctx); if (!chan_freq) { /* No available channel found */ - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_ERROR, - FL("No available channel found!!!")); + sap_err("No available channel found!!!"); sap_signal_hdd_event(sap_ctx, NULL, eSAP_DFS_NO_AVAILABLE_CHANNEL, (void *)eSAP_STATUS_SUCCESS); return QDF_STATUS_E_FAULT; } - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("ch_freq %d is in NOL, start bss on new freq %d"), + sap_debug("ch_freq %d is in NOL, start bss on new freq %d", sap_ctx->chan_freq, chan_freq); sap_ctx->chan_freq = chan_freq; @@ -2259,9 +2173,7 @@ static QDF_STATUS sap_goto_starting(struct sap_context *sap_ctx, * Transition from SAP_INIT to SAP_STARTING * (both without substates) */ - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("from state %s => %s"), - "SAP_INIT", "SAP_STARTING"); + sap_debug("from state %s => %s", "SAP_INIT", "SAP_STARTING"); /* Channel selected. Now can sap_goto_starting */ sap_ctx->fsm_state = SAP_STARTING; /* Specify the channel */ @@ -2277,23 +2189,20 @@ static QDF_STATUS sap_goto_starting(struct sap_context *sap_ctx, &sap_ctx->csr_roamProfile.dfs_regdomain); sap_ctx->csr_roamProfile.beacon_tx_rate = sap_ctx->beacon_tx_rate; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("notify hostapd about chan freq selection: %d"), + sap_debug("notify hostapd about chan freq selection: %d", sap_ctx->chan_freq); sap_signal_hdd_event(sap_ctx, NULL, eSAP_CHANNEL_CHANGE_EVENT, (void *)eSAP_STATUS_SUCCESS); sap_dfs_set_current_channel(sap_ctx); - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, "%s: session: %d", - __func__, sap_ctx->sessionId); + sap_debug("session: %d", sap_ctx->sessionId); qdf_status = sme_roam_connect(mac_handle, sap_ctx->sessionId, &sap_ctx->csr_roamProfile, &sap_ctx->csr_roamId); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "%s: Failed to issue sme_roam_connect", __func__); + sap_err("Failed to issue sme_roam_connect"); return qdf_status; } @@ -2312,11 +2221,9 @@ static QDF_STATUS sap_fsm_cac_start(struct sap_context *sap_ctx, { sap_ctx->fsm_state = SAP_STARTING; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, - FL("Move sap state to SAP_STARTING")); + sap_debug("Move sap state to SAP_STARTING"); if (!mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, - FL("sapdfs: starting dfs cac timer on sapctx[%pK]"), + sap_debug("sapdfs: starting dfs cac timer on sapctx[%pK]", sap_ctx); sap_start_dfs_cac_timer(sap_ctx); } @@ -2353,9 +2260,7 @@ static QDF_STATUS sap_fsm_state_init(struct sap_context *sap_ctx, */ qdf_status = sap_validate_chan(sap_ctx, false, true); if (QDF_IS_STATUS_ERROR(qdf_status)) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_ERROR, - FL("channel is not valid!")); + sap_err("channel is not valid!"); goto exit; } @@ -2397,9 +2302,8 @@ static QDF_STATUS sap_fsm_handle_radar_during_cac(struct sap_context *sap_ctx, mac_ctx->sap.SapDfsInfo.target_chan_freq, 0, &sap_ctx->ch_params); } else { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("Invalid target channel freq %d"), - mac_ctx->sap.SapDfsInfo.target_chan_freq); + sap_err("Invalid target channel freq %d", + mac_ctx->sap.SapDfsInfo.target_chan_freq); return QDF_STATUS_E_FAILURE; } @@ -2453,8 +2357,7 @@ static QDF_STATUS sap_fsm_handle_start_failure(struct sap_context *sap_ctx, QDF_IS_STATUS_SUCCESS( wlan_vdev_is_restart_progress(sap_ctx->vdev)))) { /* Transition from SAP_STARTING to SAP_STOPPING */ - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("In cac wait state from state %s => %s"), + sap_debug("In cac wait state from state %s => %s", "SAP_STARTING", "SAP_STOPPING"); /* * Stop the CAC timer only in following conditions @@ -2463,9 +2366,7 @@ static QDF_STATUS sap_fsm_handle_start_failure(struct sap_context *sap_ctx, * all APs are down. */ if (!sap_find_valid_concurrent_session(mac_handle)) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_INFO_MED, - FL("sapdfs: no sessions are valid, stopping timer")); + sap_debug("sapdfs: no sessions are valid, stopping timer"); sap_stop_dfs_cac_timer(sap_ctx); } @@ -2476,9 +2377,7 @@ static QDF_STATUS sap_fsm_handle_start_failure(struct sap_context *sap_ctx, * Transition from SAP_STARTING to SAP_INIT * (both without substates) */ - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("from state %s => %s"), - "SAP_STARTING", "SAP_INIT"); + sap_debug("from state %s => %s", "SAP_STARTING", "SAP_INIT"); /* Advance outer statevar */ sap_ctx->fsm_state = SAP_INIT; @@ -2510,10 +2409,8 @@ static void sap_propagate_cac_events(struct sap_context *sap_ctx) (void *) eSAP_STATUS_SUCCESS); if (qdf_status != QDF_STATUS_SUCCESS) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_DEBUG, - "failed to indicate CAC START vdev %d", - sap_ctx->sessionId); + sap_err("Failed to indicate CAC START vdev %d", + sap_ctx->sessionId); return; } @@ -2522,9 +2419,7 @@ static void sap_propagate_cac_events(struct sap_context *sap_ctx) (void *) eSAP_STATUS_SUCCESS); if (qdf_status != QDF_STATUS_SUCCESS) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_DEBUG, - "failed to indicate CAC End vdev %d", + sap_debug("Failed to indicate CAC End vdev %d", sap_ctx->sessionId); } } @@ -2614,8 +2509,7 @@ static QDF_STATUS sap_fsm_state_starting(struct sap_context *sap_ctx, if (WLAN_REG_IS_6GHZ_CHAN_FREQ(sap_ctx->chan_freq)) is_dfs = false; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("is_dfs %d"), is_dfs); + sap_debug("is_dfs %d", is_dfs); if (is_dfs) { sap_dfs_info = &mac_ctx->sap.SapDfsInfo; if ((false == sap_dfs_info->ignore_cac) && @@ -2625,15 +2519,11 @@ static QDF_STATUS sap_fsm_state_starting(struct sap_context *sap_ctx, policy_mgr_get_dfs_master_dynamic_enabled( mac_ctx->psoc, sap_ctx->sessionId)) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_INFO_HIGH, - FL("start cac timer")); + sap_debug("start cac timer"); qdf_status = sap_fsm_cac_start(sap_ctx, mac_ctx, mac_handle); } else { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_INFO_HIGH, - FL("skip cac timer")); + sap_debug("skip cac timer"); /* * If hostapd starts AP on dfs channel, * hostapd will wait for CAC START/CAC END @@ -2657,9 +2547,7 @@ static QDF_STATUS sap_fsm_state_starting(struct sap_context *sap_ctx, sap_ctx->fsm_state = SAP_STARTED; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("from state %s => %s"), - "SAP_STARTING", "SAP_STARTED"); + sap_debug("from state %s => %s", "SAP_STARTING", "SAP_STARTED"); /* Indicate change in the state to upper layers */ qdf_status = sap_signal_hdd_event(sap_ctx, roam_info, @@ -2670,9 +2558,8 @@ static QDF_STATUS sap_fsm_state_starting(struct sap_context *sap_ctx, } else if (msg == eSAP_DFS_CHANNEL_CAC_END) { qdf_status = sap_cac_end_notify(mac_handle, roam_info); } else { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("in state %s, invalid event msg %d"), - "SAP_STARTING", msg); + sap_err("in state %s, invalid event msg %d", "SAP_STARTING", + msg); } return qdf_status; @@ -2742,16 +2629,13 @@ static QDF_STATUS sap_fsm_state_started(struct sap_context *sap_ctx, * Transition from SAP_STARTED to SAP_STOPPING * (both without substates) */ - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("from state %s => %s"), - "SAP_STARTED", "SAP_STOPPING"); + sap_debug("from state %s => %s", "SAP_STARTED", "SAP_STOPPING"); sap_ctx->fsm_state = SAP_STOPPING; qdf_status = sap_goto_stopping(sap_ctx); } else if (eSAP_DFS_CHNL_SWITCH_ANNOUNCEMENT_START == msg) { uint8_t intf; if (!mac_ctx->sap.SapDfsInfo.target_chan_freq) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("Invalid target channel freq %d"), + sap_err("Invalid target channel freq %d", mac_ctx->sap.SapDfsInfo.target_chan_freq); return qdf_status; } @@ -2796,9 +2680,8 @@ static QDF_STATUS sap_fsm_state_started(struct sap_context *sap_ctx, } } } else { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("in state %s, invalid event msg %d"), - "SAP_STARTED", msg); + sap_err("in state %s, invalid event msg %d", "SAP_STARTED", + msg); } return qdf_status; @@ -2828,9 +2711,7 @@ sap_fsm_state_stopping(struct sap_context *sap_ctx, * Transition from SAP_STOPPING to SAP_INIT * (both without substates) */ - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("from state %s => %s"), - "SAP_STOPPING", "SAP_INIT"); + sap_debug("from state %s => %s", "SAP_STOPPING", "SAP_INIT"); sap_ctx->fsm_state = SAP_INIT; /* Close the SME session */ @@ -2845,9 +2726,8 @@ sap_fsm_state_stopping(struct sap_context *sap_ctx, sap_debug("SAP already in Stopping state"); qdf_status = QDF_STATUS_SUCCESS; } else { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("in state %s, invalid event msg %d"), - "SAP_STOPPING", msg); + sap_err("in state %s, invalid event msg %d", "SAP_STOPPING", + msg); } return qdf_status; @@ -2877,7 +2757,7 @@ QDF_STATUS sap_fsm(struct sap_context *sap_ctx, struct sap_sm_event *sap_event) mac_ctx = sap_get_mac_context(); if (!mac_ctx) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return QDF_STATUS_E_FAILURE; } mac_handle = MAC_HANDLE(mac_ctx); @@ -3133,8 +3013,7 @@ void sap_sort_mac_list(struct qdf_mac_addr *macList, uint8_t size) int32_t nRes = -1; if ((!macList) || (size > MAX_ACL_MAC_ADDRESS)) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("either buffer is NULL or size = %d is more"), size); + sap_err("either buffer is NULL or size = %d is more", size); return; } @@ -3169,8 +3048,7 @@ sap_search_mac_list(struct qdf_mac_addr *macList, nEnd = num_mac - 1; if ((!macList) || (num_mac > MAX_ACL_MAC_ADDRESS)) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("either buffer is NULL or size = %d is more."), num_mac); + sap_err("either buffer is NULL or size = %d is more", num_mac); return false; } @@ -3181,15 +3059,12 @@ sap_search_mac_list(struct qdf_mac_addr *macList, QDF_MAC_ADDR_SIZE); if (0 == nRes) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "search SUCC"); + sap_debug("search SUCC"); /* "index equals NULL" means the caller does not need the */ /* index value of the peerMac being searched */ if (index) { *index = (uint8_t) nMiddle; - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_INFO_HIGH, "index %d", - *index); + sap_debug("index %d", *index); } return true; } @@ -3199,8 +3074,7 @@ sap_search_mac_list(struct qdf_mac_addr *macList, nEnd = nMiddle - 1; } - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "search not succ"); + sap_debug("search not succ"); return false; } @@ -3210,13 +3084,11 @@ void sap_add_mac_to_acl(struct qdf_mac_addr *macList, int32_t nRes = -1; int i; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "add acl entered"); + sap_debug("add acl entered"); if (!macList || *size > MAX_ACL_MAC_ADDRESS) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("either buffer is NULL or size = %d is incorrect."), - *size); + sap_debug("either buffer is NULL or size = %d is incorrect", + *size); return; } @@ -3243,8 +3115,7 @@ void sap_remove_mac_from_acl(struct qdf_mac_addr *macList, { int i; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "remove acl entered"); + sap_debug("remove acl entered"); /* * Return if the list passed is empty. Ideally this should never happen * since this funcn is always called after sap_search_mac_list to get @@ -3253,9 +3124,8 @@ void sap_remove_mac_from_acl(struct qdf_mac_addr *macList, */ if ((!macList) || (*size == 0) || (*size > MAX_ACL_MAC_ADDRESS)) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("either buffer is NULL or size %d is incorrect."), - *size); + sap_err("either buffer is NULL or size %d is incorrect", + *size); return; } for (i = index; i < ((*size) - 1); i++) { @@ -3275,20 +3145,16 @@ void sap_print_acl(struct qdf_mac_addr *macList, uint8_t size) int i; uint8_t *macArray; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "print acl entered"); + sap_debug("print acl entered"); if ((!macList) || (size == 0) || (size >= MAX_ACL_MAC_ADDRESS)) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "In %s, either buffer is NULL or size %d is incorrect.", - __func__, size); + sap_err("Either buffer is NULL or size %d is incorrect", size); return; } for (i = 0; i < size; i++) { macArray = (macList + i)->bytes; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "** ACL entry %i - " QDF_MAC_ADDR_FMT, i, + sap_debug("** ACL entry %i - " QDF_MAC_ADDR_FMT, i, QDF_MAC_ADDR_REF(macArray)); } return; @@ -3306,9 +3172,8 @@ QDF_STATUS sap_is_peer_mac_allowed(struct sap_context *sap_ctx, if (sap_search_mac_list (sap_ctx->denyMacList, sap_ctx->nDenyMac, peerMac, NULL)) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "In %s, Peer " QDF_MAC_ADDR_FMT " in deny list", - __func__, QDF_MAC_ADDR_REF(peerMac)); + sap_err("Peer " QDF_MAC_ADDR_FMT " in deny list", + QDF_MAC_ADDR_REF(peerMac)); return QDF_STATUS_E_FAILURE; } /* A new station CAN associate, unless in deny list. Less stringent mode */ @@ -3317,10 +3182,9 @@ QDF_STATUS sap_is_peer_mac_allowed(struct sap_context *sap_ctx, /* A new station CANNOT associate, unless in accept list. More stringent mode */ if (eSAP_DENY_UNLESS_ACCEPTED == sap_ctx->eSapMacAddrAclMode) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "In %s, Peer " QDF_MAC_ADDR_FMT + sap_debug("Peer " QDF_MAC_ADDR_FMT " denied, Mac filter mode is eSAP_DENY_UNLESS_ACCEPTED", - __func__, QDF_MAC_ADDR_REF(peerMac)); + QDF_MAC_ADDR_REF(peerMac)); return QDF_STATUS_E_FAILURE; } @@ -3330,10 +3194,9 @@ QDF_STATUS sap_is_peer_mac_allowed(struct sap_context *sap_ctx, if (eSAP_SUPPORT_ACCEPT_AND_DENY == sap_ctx->eSapMacAddrAclMode) { sap_signal_hdd_event(sap_ctx, NULL, eSAP_UNKNOWN_STA_JOIN, (void *) peerMac); - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "In %s, Peer " QDF_MAC_ADDR_FMT + sap_debug("Peer " QDF_MAC_ADDR_FMT " denied, Mac filter mode is eSAP_SUPPORT_ACCEPT_AND_DENY", - __func__, QDF_MAC_ADDR_REF(peerMac)); + QDF_MAC_ADDR_REF(peerMac)); return QDF_STATUS_E_FAILURE; } return QDF_STATUS_SUCCESS; @@ -3398,7 +3261,7 @@ static QDF_STATUS sap_get_freq_list(struct sap_context *sap_ctx, mac_ctx = sap_get_mac_context(); if (!mac_ctx) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); *num_ch = 0; *freq_list = NULL; return QDF_STATUS_E_FAULT; @@ -3632,14 +3495,13 @@ qdf_freq_t sap_indicate_radar(struct sap_context *sap_ctx) struct mac_context *mac; if (!sap_ctx) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("null sap_ctx")); + sap_err("null sap_ctx"); return 0; } mac = sap_get_mac_context(); if (!mac) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return 0; } @@ -3657,9 +3519,8 @@ qdf_freq_t sap_indicate_radar(struct sap_context *sap_ctx) mac->sap.SapDfsInfo.sap_radar_found_status = true; if (sap_ctx->chan_before_pre_cac) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, - FL("sapdfs: set chan before pre cac %d as target chan"), - sap_ctx->chan_before_pre_cac); + sap_info("sapdfs: set chan before pre cac %d as target chan", + sap_ctx->chan_before_pre_cac); return sap_ctx->chan_before_pre_cac; } @@ -3673,9 +3534,7 @@ qdf_freq_t sap_indicate_radar(struct sap_context *sap_ctx) sap_signal_hdd_event(sap_ctx, NULL, eSAP_DFS_NO_AVAILABLE_CHANNEL, (void *) eSAP_STATUS_SUCCESS); - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN, - FL("sapdfs: New selected target freq is [%d]"), - chan_freq); + sap_warn("sapdfs: New selected target freq is [%d]", chan_freq); return chan_freq; } @@ -3693,15 +3552,13 @@ void sap_dfs_cac_timer_callback(void *data) struct mac_context *mac; if (!mac_handle) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "In %s invalid mac_handle", __func__); + sap_err("Invalid mac_handle"); return; } mac = MAC_CONTEXT(mac_handle); sap_ctx = sap_find_cac_wait_session(mac_handle); if (!sap_ctx) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "%s: no SAP contexts in wait state", __func__); + sap_err("no SAP contexts in wait state"); return; } @@ -3720,9 +3577,8 @@ void sap_dfs_cac_timer_callback(void *data) /* * CAC Complete, post eSAP_DFS_CHANNEL_CAC_END to sap_fsm */ - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, - "sapdfs: Sending eSAP_DFS_CHANNEL_CAC_END for target_chan_freq = %d on sapctx[%pK]", - sap_ctx->chan_freq, sap_ctx); + sap_debug("sapdfs: Sending eSAP_DFS_CHANNEL_CAC_END for target_chan_freq = %d on sapctx[%pK]", + sap_ctx->chan_freq, sap_ctx); sap_event.event = eSAP_DFS_CHANNEL_CAC_END; sap_event.params = 0; @@ -3744,7 +3600,7 @@ static int sap_stop_dfs_cac_timer(struct sap_context *sap_ctx) mac = sap_get_mac_context(); if (!mac) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return 0; } @@ -3778,20 +3634,18 @@ static int sap_start_dfs_cac_timer(struct sap_context *sap_ctx) enum dfs_reg dfs_region; if (!sap_ctx) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "%s: null sap_ctx", __func__); + sap_err("null sap_ctx"); return 0; } mac = sap_get_mac_context(); if (!mac) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return 0; } if (sap_ctx->dfs_cac_offload) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - "%s: cac timer offloaded to firmware", __func__); + sap_debug("cac timer offloaded to firmware"); mac->sap.SapDfsInfo.is_dfs_cac_timer_running = true; return 1; } @@ -3803,8 +3657,7 @@ static int sap_start_dfs_cac_timer(struct sap_context *sap_ctx) #ifdef QCA_WIFI_NAPIER_EMULATION cac_dur = cac_dur / 100; #endif - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, - "sapdfs: SAP_DFS_CHANNEL_CAC_START on CH freq %d, CAC_DUR-%d sec", + sap_debug("sapdfs: SAP_DFS_CHANNEL_CAC_START on CH freq %d, CAC_DUR-%d sec", sap_ctx->chan_freq, cac_dur / 1000); qdf_mc_timer_init(&mac->sap.SapDfsInfo.sap_dfs_cac_timer, @@ -3815,8 +3668,7 @@ static int sap_start_dfs_cac_timer(struct sap_context *sap_ctx) status = qdf_mc_timer_start(&mac->sap.SapDfsInfo.sap_dfs_cac_timer, cac_dur); if (QDF_IS_STATUS_ERROR(status)) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "%s: failed to start cac timer", __func__); + sap_err("failed to start cac timer"); goto destroy_timer; } @@ -3841,13 +3693,13 @@ QDF_STATUS sap_init_dfs_channel_nol_list(struct sap_context *sap_ctx) struct mac_context *mac; if (!sap_ctx) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid SAP context"); + sap_err("Invalid SAP context"); return QDF_STATUS_E_FAULT; } mac = sap_get_mac_context(); if (!mac) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return QDF_STATUS_E_FAULT; } @@ -3904,17 +3756,11 @@ bool is_concurrent_sap_ready_for_channel_change(mac_handle_t mac_handle, sap_context = mac->sap.sapCtxList[intf].sap_context; if (sap_context == sap_ctx) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_ERROR, - FL("sapCtx matched [%pK]"), - sap_ctx); + sap_err("sapCtx matched [%pK]", sap_ctx); continue; } else { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_ERROR, - FL - ("concurrent sapCtx[%pK] didn't matche with [%pK]"), - sap_context, sap_ctx); + sap_err("concurrent sapCtx[%pK] didn't matche with [%pK]", + sap_context, sap_ctx); return sap_context->is_sap_ready_for_chnl_chng; } } @@ -3948,8 +3794,7 @@ bool sap_is_conc_sap_doing_scc_dfs(mac_handle_t mac_handle, */ if (!wlan_reg_is_dfs_for_freq(mac->pdev, ch_freq)) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, - FL("skip this loop as provided channel is non-dfs")); + sap_debug("skip this loop as provided channel is non-dfs"); return false; } diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 186da47920c5..872656794eaf 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -246,13 +246,13 @@ static void wlansap_owe_cleanup(struct sap_context *sap_ctx) QDF_STATUS status; if (!sap_ctx) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid SAP context"); + sap_err("Invalid SAP context"); return; } mac = sap_get_mac_context(); if (!mac) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return; } @@ -280,8 +280,7 @@ static void wlansap_owe_cleanup(struct sap_context *sap_ctx) status = sme_update_owe_info(mac, assoc_ind); qdf_mem_free(assoc_ind); } else { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, - "Failed to remove assoc ind"); + sap_err("Failed to remove assoc ind"); } node = next_node; next_node = NULL; @@ -300,8 +299,7 @@ QDF_STATUS sap_init_ctx(struct sap_context *sap_ctx, QDF_STATUS status; struct mac_context *mac; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "wlansap_start invoked successfully"); + sap_debug("wlansap_start invoked successfully"); if (!sap_ctx) { sap_err("Invalid SAP pointer"); @@ -328,7 +326,7 @@ QDF_STATUS sap_init_ctx(struct sap_context *sap_ctx, mac = sap_get_mac_context(); if (!mac) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return QDF_STATUS_E_INVAL; } @@ -346,8 +344,7 @@ QDF_STATUS sap_init_ctx(struct sap_context *sap_ctx, if (!reinit) { status = wlansap_owe_init(sap_ctx); if (QDF_STATUS_SUCCESS != status) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, - "OWE init failed"); + sap_err("OWE init failed"); return QDF_STATUS_E_FAILURE; } } @@ -372,7 +369,7 @@ QDF_STATUS sap_deinit_ctx(struct sap_context *sap_ctx) mac = sap_get_mac_context(); if (!mac) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return QDF_STATUS_E_FAULT; } ucfg_scan_unregister_requester(mac->psoc, sap_ctx->req_id); @@ -394,8 +391,7 @@ QDF_STATUS sap_deinit_ctx(struct sap_context *sap_ctx) QDF_STATUS sap_destroy_ctx(struct sap_context *sap_ctx) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("Enter")); + sap_debug("Enter"); if (!sap_ctx) { sap_err("Invalid SAP pointer"); @@ -416,8 +412,7 @@ bool wlansap_is_channel_in_nol_list(struct sap_context *sap_ctx, ePhyChanBondState chanBondState) { if (!sap_ctx) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "%s: Invalid SAP pointer from pCtx", __func__); + sap_err("Invalid SAP pointer from pCtx"); return QDF_STATUS_E_FAULT; } @@ -444,7 +439,7 @@ bool wlansap_is_channel_leaking_in_nol(struct sap_context *sap_ctx, leakage_adjusted_lst[0] = channel; mac_ctx = sap_get_mac_context(); if (!mac_ctx) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return QDF_STATUS_E_FAULT; } if (QDF_IS_STATUS_ERROR(wlansap_mark_leaking_channel(mac_ctx->pdev, @@ -466,7 +461,7 @@ uint16_t wlansap_check_cc_intf(struct sap_context *sap_ctx) mac = sap_get_mac_context(); if (!mac) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return 0; } phy_mode = sap_ctx->csr_roamProfile.phyMode; @@ -638,9 +633,7 @@ void wlan_sap_set_sap_ctx_acs_cfg(struct sap_context *sap_ctx, struct sap_config *sap_config) { if (!sap_ctx) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "%s: Invalid SAP pointer", - __func__); + sap_err("Invalid SAP pointer"); return; } @@ -819,12 +812,10 @@ QDF_STATUS wlansap_set_mac_acl(struct sap_context *sap_ctx, { QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "wlansap_set_mac_acl"); + sap_debug("wlansap_set_mac_acl"); if (!sap_ctx) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "%s: Invalid SAP pointer", __func__); + sap_err("Invalid SAP pointer"); return QDF_STATUS_E_FAULT; } /* Copy MAC filtering settings to sap context */ @@ -967,15 +958,12 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx, QDF_MAC_ADDR_REF(peer_sta_mac)); return QDF_STATUS_E_FAULT; } - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, - "Modify ACL entered\n" "Before modification of ACL\n" + sap_debug("Modify ACL entered\n" "Before modification of ACL\n" "size of accept and deny lists %d %d", sap_ctx->nAcceptMac, sap_ctx->nDenyMac); - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "*** WHITE LIST ***"); + sap_debug("*** WHITE LIST ***"); sap_print_acl(sap_ctx->acceptMacList, sap_ctx->nAcceptMac); - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "*** BLACK LIST ***"); + sap_debug("*** BLACK LIST ***"); sap_print_acl(sap_ctx->denyMacList, sap_ctx->nDenyMac); /* the expectation is a mac addr will not be in both the lists @@ -997,8 +985,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx, return QDF_STATUS_E_FAILURE; } - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, - "cmd %d", cmd); + sap_debug("cmd %d", cmd); switch (list_type) { case eSAP_WHITE_LIST: @@ -1029,11 +1016,9 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx, sap_add_mac_to_acl(sap_ctx->acceptMacList, &sap_ctx->nAcceptMac, peer_sta_mac); - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_INFO_LOW, - "size of accept and deny lists %d %d", - sap_ctx->nAcceptMac, - sap_ctx->nDenyMac); + sap_debug("size of accept and deny lists %d %d", + sap_ctx->nAcceptMac, + sap_ctx->nDenyMac); } else if (cmd == DELETE_STA_FROM_ACL) { if (sta_white_list) { @@ -1049,9 +1034,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx, SIR_MAC_MGMT_DEAUTH, &delStaParams); wlansap_deauth_sta(sap_ctx, &delStaParams); - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_INFO_LOW, - "size of accept and deny lists %d %d", + sap_debug("size of accept and deny lists %d %d", sap_ctx->nAcceptMac, sap_ctx->nDenyMac); } else { @@ -1101,9 +1084,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx, sap_info("... Now add to black list"); sap_add_mac_to_acl(sap_ctx->denyMacList, &sap_ctx->nDenyMac, peer_sta_mac); - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_INFO_LOW, - "size of accept and deny lists %d %d", + sap_debug("size of accept and deny lists %d %d", sap_ctx->nAcceptMac, sap_ctx->nDenyMac); } else if (cmd == DELETE_STA_FROM_ACL) { @@ -1112,9 +1093,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx, sap_remove_mac_from_acl(sap_ctx->denyMacList, &sap_ctx->nDenyMac, staBLIndex); - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_INFO_LOW, - "no accept and deny mac %d %d", + sap_debug("no accept and deny mac %d %d", sap_ctx->nAcceptMac, sap_ctx->nDenyMac); } else { @@ -1135,13 +1114,10 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx, return QDF_STATUS_E_FAILURE; } } - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, - "After modification of ACL"); - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "*** WHITE LIST ***"); + sap_debug("After modification of ACL"); + sap_debug("*** WHITE LIST ***"); sap_print_acl(sap_ctx->acceptMacList, sap_ctx->nAcceptMac); - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "*** BLACK LIST ***"); + sap_debug("*** BLACK LIST ***"); sap_print_acl(sap_ctx->denyMacList, sap_ctx->nDenyMac); return QDF_STATUS_SUCCESS; } @@ -1158,7 +1134,7 @@ QDF_STATUS wlansap_disassoc_sta(struct sap_context *sap_ctx, mac = sap_get_mac_context(); if (!mac) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return QDF_STATUS_E_FAULT; } @@ -1178,7 +1154,7 @@ QDF_STATUS wlansap_deauth_sta(struct sap_context *sap_ctx, mac = sap_get_mac_context(); if (!mac) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return QDF_STATUS_E_FAULT; } @@ -1356,7 +1332,7 @@ QDF_STATUS wlansap_set_channel_change_with_csa(struct sap_context *sap_ctx, mac = sap_get_mac_context(); if (!mac) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return QDF_STATUS_E_FAULT; } mac_handle = MAC_HANDLE(mac); @@ -1621,8 +1597,7 @@ bool wlan_sap_is_pre_cac_active(mac_handle_t handle) mac = MAC_CONTEXT(handle); if (!mac) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "%s: Invalid mac context", __func__); + sap_err("Invalid mac context"); return false; } @@ -1651,8 +1626,7 @@ QDF_STATUS wlan_sap_get_pre_cac_vdev_id(mac_handle_t handle, uint8_t *vdev_id) mac = MAC_CONTEXT(handle); if (!mac) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "%s: Invalid mac context", __func__); + sap_err("Invalid mac context"); return QDF_STATUS_E_FAULT; } @@ -1768,7 +1742,7 @@ QDF_STATUS wlansap_channel_change_request(struct sap_context *sap_ctx, mac_ctx = sap_get_mac_context(); if (!mac_ctx) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return QDF_STATUS_E_FAULT; } @@ -1838,7 +1812,7 @@ QDF_STATUS wlansap_start_beacon_req(struct sap_context *sap_ctx) mac = sap_get_mac_context(); if (!mac) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return QDF_STATUS_E_FAULT; } @@ -1866,7 +1840,7 @@ QDF_STATUS wlansap_dfs_send_csa_ie_request(struct sap_context *sap_ctx) mac = sap_get_mac_context(); if (!mac) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return QDF_STATUS_E_FAULT; } @@ -2020,10 +1994,7 @@ wlansap_set_dfs_preferred_channel_location(mac_handle_t mac_handle) if (DFS_MKK_REGION == dfs_region) { mac->sap.SapDfsInfo.sap_operating_chan_preferred_location = dfs_preferred_channels_location; - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_INFO_LOW, - FL - ("sapdfs:Set Preferred Operating Channel location=%d"), + sap_debug("sapdfs:Set Preferred Operating Channel location=%d", mac->sap.SapDfsInfo. sap_operating_chan_preferred_location); @@ -2349,7 +2320,7 @@ QDF_STATUS wlansap_set_dfs_nol(struct sap_context *sap_ctx, mac = sap_get_mac_context(); if (!mac) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return QDF_STATUS_E_FAULT; } @@ -2450,7 +2421,7 @@ QDF_STATUS wlansap_acs_chselect(struct sap_context *sap_context, mac = sap_get_mac_context(); if (!mac) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return QDF_STATUS_E_FAULT; } @@ -2588,7 +2559,7 @@ void wlansap_cleanup_cac_timer(struct sap_context *sap_ctx) mac = sap_get_mac_context(); if (!mac) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return; } @@ -2615,7 +2586,7 @@ static int wlansap_validate_owe_ie(const uint8_t *ie, uint32_t remaining_ie_len) uint8_t ie_id, ie_len, ie_ext_id = 0; if (remaining_ie_len < 2) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "IE too short"); + sap_err("IE too short"); return -EINVAL; } @@ -2630,8 +2601,7 @@ static int wlansap_validate_owe_ie(const uint8_t *ie, uint32_t remaining_ie_len) case DOT11F_EID_RSN: if (ie_len < DOT11F_IE_RSN_MIN_LEN || ie_len > DOT11F_IE_RSN_MAX_LEN) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, - "Invalid RSN IE len %d", ie_len); + sap_err("Invalid RSN IE len %d", ie_len); return -EINVAL; } ie_len += 2; @@ -2639,25 +2609,23 @@ static int wlansap_validate_owe_ie(const uint8_t *ie, uint32_t remaining_ie_len) case DOT11F_EID_DH_PARAMETER_ELEMENT: ie_ext_id = ie[2]; if (ie_ext_id != DH_OUI_TYPE) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, - "Invalid DH IE ID %d", ie_ext_id); + sap_err("Invalid DH IE ID %d", ie_ext_id); return -EINVAL; } if (ie_len < DOT11F_IE_DH_PARAMETER_ELEMENT_MIN_LEN || ie_len > DOT11F_IE_DH_PARAMETER_ELEMENT_MAX_LEN) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, - "Invalid DH IE len %d", ie_len); + sap_err("Invalid DH IE len %d", ie_len); return -EINVAL; } ie_len += 2; break; default: - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid IE %d", ie_id); + sap_err("Invalid IE %d", ie_id); return -EINVAL; } if (ie_len > remaining_ie_len) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid IE len"); + sap_err("Invalid IE len"); return -EINVAL; } @@ -2703,26 +2671,25 @@ QDF_STATUS wlansap_update_owe_info(struct sap_context *sap_ctx, QDF_STATUS status = QDF_STATUS_SUCCESS; if (!wlansap_validate_owe_ies(ie, ie_len)) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid OWE IE"); + sap_err("Invalid OWE IE"); return QDF_STATUS_E_FAULT; } if (!sap_ctx) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid SAP context"); + sap_err("Invalid SAP context"); return QDF_STATUS_E_FAULT; } mac = sap_get_mac_context(); if (!mac) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); + sap_err("Invalid MAC context"); return QDF_STATUS_E_FAULT; } if (QDF_STATUS_SUCCESS != qdf_list_peek_front(&sap_ctx->owe_pending_assoc_ind_list, &next_node)) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, - "Failed to find assoc ind list"); + sap_err("Failed to find assoc ind list"); return QDF_STATUS_E_FAILURE; } @@ -2737,8 +2704,7 @@ QDF_STATUS wlansap_update_owe_info(struct sap_context *sap_ctx, &sap_ctx->owe_pending_assoc_ind_list, node); if (status != QDF_STATUS_SUCCESS) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, - "Failed to remove assoc ind"); + sap_err("Failed to remove assoc ind"); return status; } assoc_ind = owe_assoc_ind->assoc_ind;