From a038dd68e600f6f7973c8c4d61b6d3fd63a76c44 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Mon, 17 Feb 2020 14:40:57 +0530 Subject: [PATCH] qcacld-3.0: Fix logging for the AUTH and Assoc frames Fix logging for the AUTH and Assoc frames TX and RX. Change-Id: Ifb983acc0b8485baf210d90d0d8be0fadeeb3548 CRs-Fixed: 2623210 --- .../src/pe/lim/lim_process_assoc_req_frame.c | 10 +++++----- .../src/pe/lim/lim_process_assoc_rsp_frame.c | 2 +- .../src/pe/lim/lim_send_management_frames.c | 19 +++++++------------ 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c index 0968e9921736..79d72ae96a20 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c @@ -2175,11 +2175,11 @@ void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_in hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info); frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info); - pe_debug("Rcvd: %s Req Frame sessionid: %d systemrole: %d MlmState: %d from: " - QDF_MAC_ADDR_STR, - (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", - session->peSessionId, GET_LIM_SYSTEM_ROLE(session), - session->limMlmState, QDF_MAC_ADDR_ARRAY(hdr->sa)); + pe_nofl_debug("Assoc req RX: subtype %d vdev %d sys role %d lim state %d rssi %d from " QDF_MAC_ADDR_STR, + sub_type, session->vdev_id, GET_LIM_SYSTEM_ROLE(session), + session->limMlmState, + WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info), + QDF_MAC_ADDR_ARRAY(hdr->sa)); if (LIM_IS_STA_ROLE(session)) { pe_err("Rcvd unexpected ASSOC REQ, sessionid: %d sys sub_type: %d for role: %d from: " diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c index 7af661c1be55..6702cf756953 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c @@ -619,7 +619,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, return; } - pe_nofl_info("Assoc RX subtype %d vdev %d sys role %d lim state %d rssi %d from " QDF_MAC_ADDR_STR, + pe_nofl_info("Assoc rsp RX: subtype %d vdev %d sys role %d lim state %d rssi %d from " QDF_MAC_ADDR_STR, subtype, session_entry->vdev_id, GET_LIM_SYSTEM_ROLE(session_entry), session_entry->limMlmState, rssi, diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index 8d1e9c33bec0..0644fd3daded 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -1524,14 +1524,9 @@ lim_send_assoc_rsp_mgmt_frame( status); } - if (subtype == LIM_ASSOC) - pe_debug("*** Sending Assoc Resp status %d aid %d to", - status_code, aid); - else - pe_debug("*** Sending ReAssoc Resp status %d aid %d to", - status_code, aid); - - lim_print_mac_addr(mac_ctx, mac_hdr->da, LOGD); + pe_nofl_debug("Assoc rsp TX: vdev %d subtype %d to %pM seq num %d status %d aid %d", + pe_session->vdev_id, subtype, mac_hdr->da, + mac_ctx->mgmtSeqNum, status_code, aid); if (addn_ie_len && addn_ie_len <= WNI_CFG_ASSOC_RSP_ADDNIE_DATA_LEN) qdf_mem_copy(frame + sizeof(tSirMacMgmtHdr) + payload, @@ -1742,7 +1737,7 @@ static QDF_STATUS lim_assoc_tx_complete_cnf(void *context, uint16_t reason_code; struct mac_context *mac_ctx = (struct mac_context *)context; - pe_nofl_info("Assoc TX %s", + pe_nofl_info("Assoc req TX: %s", (tx_complete == WMI_MGMT_TX_COMP_TYPE_COMPLETE_OK) ? "success" : "fail"); @@ -2415,7 +2410,7 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx, MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, pe_session->peSessionId, mac_hdr->fc.subType)); - pe_nofl_info("Assoc TX vdev %d to %pM seq num %d", pe_session->vdev_id, + pe_nofl_info("Assoc req TX: vdev %d to %pM seq num %d", pe_session->vdev_id, pe_session->bssId, mac_ctx->mgmtSeqNum); QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, frame, (uint16_t)(sizeof(tSirMacMgmtHdr) + payload)); @@ -2537,7 +2532,7 @@ static QDF_STATUS lim_auth_tx_complete_cnf(void *context, uint16_t auth_ack_status; uint16_t reason_code; - pe_nofl_info("Auth TX %s", + pe_nofl_info("Auth TX: %s", (tx_complete == WMI_MGMT_TX_COMP_TYPE_COMPLETE_OK) ? "success" : "fail"); if (tx_complete == WMI_MGMT_TX_COMP_TYPE_COMPLETE_OK) { @@ -2833,7 +2828,7 @@ alloc_packet: } } - pe_nofl_info("Auth TX seq %d seq num %d status %d WEP %d to " QDF_MAC_ADDR_STR, + pe_nofl_info("Auth TX: seq %d seq num %d status %d WEP %d to " QDF_MAC_ADDR_STR, auth_frame->authTransactionSeqNumber, mac_ctx->mgmtSeqNum, auth_frame->authStatusCode, mac_hdr->fc.wep, QDF_MAC_ADDR_ARRAY(mac_hdr->da));