summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNishank Aggarwal <naggar@codeaurora.org>2017-03-08 20:33:56 +0530
committerSandeep Puligilla <spuligil@codeaurora.org>2017-03-10 19:32:08 -0800
commit4b37fe28293b42018b51ab26987302654b96ceef (patch)
treed488a9cbc2d15edbf4f1e0bd24463d8b000bd60d
parentd6e0c4fd912740a985e9087de63b022d6e0dc980 (diff)
qcacld-3.0: Reduce the log spam in Kmsg
Move the logs to appropriate log levels to reduce the log spam in kmsg Change-Id: I2138de8f2be2e432ba84ee0615c14946da228fc9 CRs-Fixed: 1093093
Diffstat
-rw-r--r--core/mac/src/pe/lim/lim_process_auth_frame.c39
-rw-r--r--core/mac/src/pe/lim/lim_process_message_queue.c83
-rw-r--r--core/mac/src/pe/lim/lim_process_mlm_req_messages.c4
-rw-r--r--core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c104
-rw-r--r--core/mac/src/pe/lim/lim_process_sme_req_messages.c274
-rw-r--r--core/mac/src/pe/lim/lim_scan_result_utils.c19
-rw-r--r--core/mac/src/pe/lim/lim_send_management_frames.c96
-rw-r--r--core/mac/src/pe/lim/lim_send_sme_rsp_messages.c75
-rw-r--r--core/mac/src/pe/lim/lim_utils.c438
-rw-r--r--core/mac/src/pe/sch/sch_beacon_process.c28
-rw-r--r--core/mac/src/sys/legacy/src/utils/src/parser_api.c391
-rw-r--r--core/sme/src/common/sme_api.c17
-rw-r--r--core/sme/src/csr/csr_api_roam.c4
-rw-r--r--core/sme/src/csr/csr_util.c2
14 files changed, 675 insertions, 899 deletions
diff --git a/core/mac/src/pe/lim/lim_process_auth_frame.c b/core/mac/src/pe/lim/lim_process_auth_frame.c
index 921e4f2ecb8c..3cbc644ac0d9 100644
--- a/core/mac/src/pe/lim/lim_process_auth_frame.c
+++ b/core/mac/src/pe/lim/lim_process_auth_frame.c
@@ -164,9 +164,9 @@ static void lim_process_auth_shared_system_algo(tpAniSirGlobal mac_ctx,
auth_node->timestamp = qdf_mc_timer_get_system_ticks();
lim_add_pre_auth_node(mac_ctx, auth_node);
- lim_log(mac_ctx, LOG1, FL("Alloc new data: %p id %d peer "),
+ lim_log(mac_ctx, LOGD, FL("Alloc new data: %p id %d peer "),
auth_node, auth_node->authNodeIdx);
- lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOG1);
+ lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOGD);
/* / Create and activate Auth Response timer */
if (tx_timer_change_context(&auth_node->timer,
auth_node->authNodeIdx) != TX_SUCCESS) {
@@ -242,8 +242,8 @@ static void lim_process_auth_open_system_algo(tpAniSirGlobal mac_ctx,
lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOGW);
return;
}
- lim_log(mac_ctx, LOG1, FL("Alloc new data: %p peer "), auth_node);
- lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOG1);
+ lim_log(mac_ctx, LOGD, FL("Alloc new data: %p peer "), auth_node);
+ lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOGD);
qdf_mem_copy((uint8_t *) auth_node->peerMacAddr,
mac_hdr->sa, sizeof(tSirMacAddr));
auth_node->mlmState = eLIM_MLM_AUTHENTICATED_STATE;
@@ -562,10 +562,10 @@ static void lim_process_auth_frame_type2(tpAniSirGlobal mac_ctx,
* Received Auth frame2 in an unexpected state.
* Log error and ignore the frame.
*/
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("rx Auth frm2 from peer in state %d, addr "),
pe_session->limMlmState);
- lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOG1);
+ lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOGD);
}
return;
}
@@ -644,9 +644,9 @@ static void lim_process_auth_frame_type2(tpAniSirGlobal mac_ctx,
return;
}
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Alloc new data: %p peer"), auth_node);
- lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOG1);
+ lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOGD);
qdf_mem_copy((uint8_t *) auth_node->peerMacAddr,
mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr,
sizeof(tSirMacAddr));
@@ -946,7 +946,7 @@ static void lim_process_auth_frame_type4(tpAniSirGlobal mac_ctx,
* Log error and ignore the frame.
*/
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGW,
FL("received unexpected Auth frame4 from peer in state %d, addr "
MAC_ADDRESS_STR),
pe_session->limMlmState,
@@ -1014,9 +1014,9 @@ static void lim_process_auth_frame_type4(tpAniSirGlobal mac_ctx,
lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOGW);
return;
}
- lim_log(mac_ctx, LOG1, FL("Alloc new data: %p peer "),
+ lim_log(mac_ctx, LOGD, FL("Alloc new data: %p peer "),
auth_node);
- lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOG1);
+ lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOGD);
qdf_mem_copy((uint8_t *) auth_node->peerMacAddr,
mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr,
sizeof(tSirMacAddr));
@@ -1127,7 +1127,7 @@ lim_process_auth_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
/* Restore default failure timeout */
if (QDF_P2P_CLIENT_MODE == pe_session->pePersona &&
pe_session->defaultAuthFailureTimeout) {
- lim_log(mac_ctx, LOG1, FL("Restore default failure timeout"));
+ lim_log(mac_ctx, LOGD, FL("Restore default failure timeout"));
cfg_set_int(mac_ctx, WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT,
pe_session->defaultAuthFailureTimeout);
}
@@ -1512,22 +1512,18 @@ tSirRetStatus lim_process_auth_frame_no_session(tpAniSirGlobal pMac, uint8_t *pB
* as this was indeed a response from the BSSID we tried to
* pre-auth.
*/
- PELOGE(lim_log(pMac, LOG1, "Auth rsp already posted to SME"
+ lim_log(pMac, LOGD, "Auth rsp already posted to SME"
" (session %p, FT session %p)", psessionEntry,
psessionEntry);
- );
return eSIR_SUCCESS;
} else {
- PELOGE(lim_log(pMac, LOGW, "Auth rsp not yet posted to SME"
+ lim_log(pMac, LOGW, "Auth rsp not yet posted to SME"
" (session %p, FT session %p)", psessionEntry,
psessionEntry);
- );
psessionEntry->ftPEContext.pFTPreAuthReq->bPreAuthRspProcessed =
true;
}
- lim_log(pMac, LOG1, FL("Pre-Auth response received from neighbor"));
- lim_log(pMac, LOG1, FL("Pre-Auth done state"));
/* Stopping timer now, that we have our unicast from the AP */
/* of our choice. */
lim_deactivate_and_change_timer(pMac, eLIM_FT_PREAUTH_RSP_TIMER);
@@ -1543,14 +1539,13 @@ tSirRetStatus lim_process_auth_frame_no_session(tpAniSirGlobal pMac, uint8_t *pB
}
pRxAuthFrameBody = &rxAuthFrame;
- PELOGE(lim_log(pMac, LOG1,
- FL
- ("Received Auth frame with type=%d seqnum=%d, status=%d (%d)"),
+ lim_log(pMac, LOGD,
+ FL("Received Auth frame with type=%d seqnum=%d, status=%d (%d)"),
(uint32_t) pRxAuthFrameBody->authAlgoNumber,
(uint32_t) pRxAuthFrameBody->authTransactionSeqNumber,
(uint32_t) pRxAuthFrameBody->authStatusCode,
(uint32_t) pMac->lim.gLimNumPreAuthContexts);
- )
+
switch (pRxAuthFrameBody->authTransactionSeqNumber) {
case SIR_MAC_AUTH_FRAME_2:
if (pRxAuthFrameBody->authStatusCode != eSIR_MAC_SUCCESS_STATUS) {
diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c
index f0d37da0f3b8..a681328d13c3 100644
--- a/core/mac/src/pe/lim/lim_process_message_queue.c
+++ b/core/mac/src/pe/lim/lim_process_message_queue.c
@@ -119,7 +119,7 @@ static void lim_process_dual_mac_cfg_resp(tpAniSirGlobal mac, void *body)
msg.type = eWNI_SME_SET_DUAL_MAC_CFG_RESP;
msg.bodyptr = param;
msg.bodyval = 0;
- lim_log(mac, LOG1, FL("Send eWNI_SME_SET_DUAL_MAC_CFG_RESP to SME"));
+ lim_log(mac, LOGD, FL("Send eWNI_SME_SET_DUAL_MAC_CFG_RESP to SME"));
lim_sys_process_mmh_msg_api(mac, &msg, ePROT);
return;
}
@@ -236,7 +236,7 @@ static void lim_process_set_antenna_resp(tpAniSirGlobal mac, void *body)
msg.type = eWNI_SME_SET_ANTENNA_MODE_RESP;
msg.bodyptr = param;
msg.bodyval = 0;
- lim_log(mac, LOG1, FL("Send eWNI_SME_SET_ANTENNA_MODE_RESP to SME"));
+ lim_log(mac, LOGD, FL("Send eWNI_SME_SET_ANTENNA_MODE_RESP to SME"));
lim_sys_process_mmh_msg_api(mac, &msg, ePROT);
return;
}
@@ -429,12 +429,9 @@ uint8_t static def_msg_decision(tpAniSirGlobal pMac, tpSirMsgQ limMsg)
* ADD TS response received over the air */
!(limMsg->type == SIR_BB_XPORT_MGMT_MSG &&
pMac->lim.gLimAddtsSent)) {
- PELOG1(lim_log
- (pMac, LOG1,
- FL
- ("Defer the current message %s , gLimProcessDefdMsgs is false and system is not in scan/learn mode"),
+ lim_log(pMac, LOGD,
+ FL("Defer the current message %s , gLimProcessDefdMsgs is false and system is not in scan/learn mode"),
lim_msg_str(limMsg->type));
- )
/* Defer processsing this message */
if (lim_defer_msg(pMac, limMsg) != TX_SUCCESS) {
QDF_TRACE(QDF_MODULE_ID_PE, LOGE,
@@ -608,12 +605,12 @@ __lim_process_ext_scan_beacon_probe_rsp(tpAniSirGlobal pmac,
}
if (sub_type == SIR_MAC_MGMT_BEACON) {
- lim_log(pmac, LOG2, FL("Beacon due to ExtScan/epno"));
+ lim_log(pmac, LOGD, FL("Beacon due to ExtScan/epno"));
status = sir_convert_beacon_frame2_struct(pmac,
(uint8_t *)rx_pkt_info,
frame);
} else if (sub_type == SIR_MAC_MGMT_PROBE_RSP) {
- lim_log(pmac, LOG2, FL("Probe Rsp due to ExtScan/epno"));
+ lim_log(pmac, LOGD, FL("Probe Rsp due to ExtScan/epno"));
body = WMA_GET_RX_MPDU_DATA(rx_pkt_info);
status = sir_convert_probe_frame2_struct(pmac, body,
frm_len, frame);
@@ -745,12 +742,12 @@ static void lim_handle_unknown_a2_index_frames(tpAniSirGlobal mac_ctx,
mac_hdr = WMA_GET_RX_MPDUHEADER3A(rx_pkt_buffer);
if (lim_is_group_addr(mac_hdr->addr2)) {
- QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
FL("Ignoring A2 Invalid Packet received for MC/BC:"));
- lim_print_mac_addr(mac_ctx, mac_hdr->addr2, LOG2);
+ lim_print_mac_addr(mac_ctx, mac_hdr->addr2, LOGD);
return;
}
- QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
FL("type=0x%x, subtype=0x%x"),
mac_hdr->fc.type, mac_hdr->fc.subType);
/* Currently only following type and subtype are handled.
@@ -810,7 +807,7 @@ lim_check_mgmt_registered_frames(tpAniSirGlobal mac_ctx, uint8_t *buff_desc,
if ((type == SIR_MAC_MGMT_FRAME)
&& (fc.type == SIR_MAC_MGMT_FRAME)
&& (sub_type == SIR_MAC_MGMT_RESERVED15)) {
- QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
FL
("rcvd frm match for SIR_MAC_MGMT_RESERVED15"));
match = true;
@@ -842,7 +839,7 @@ lim_check_mgmt_registered_frames(tpAniSirGlobal mac_ctx, uint8_t *buff_desc,
}
if (match) {
- QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
FL("rcvd frame match with registered frame params"));
/* Indicate this to SME */
lim_send_sme_mgmt_frame_ind(mac_ctx, hdr->fc.subType,
@@ -908,7 +905,7 @@ lim_handle80211_frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, uint8_t *pDeferMsg
pHdr->bssId, &sessionId);
if (psessionEntry &&
(QDF_SAP_MODE == psessionEntry->pePersona)) {
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("CAC timer running - drop the frame"));
goto end;
}
@@ -955,10 +952,10 @@ lim_handle80211_frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, uint8_t *pDeferMsg
#endif
if (WMA_GET_OFFLOADSCANLEARN(pRxPacketInfo)) {
if (fc.subType == SIR_MAC_MGMT_BEACON) {
- lim_log(pMac, LOG2, FL("Learning scan beacon"));
+ lim_log(pMac, LOGD, FL("Learning scan beacon"));
__lim_handle_beacon(pMac, limMsg, NULL);
} else if (fc.subType == SIR_MAC_MGMT_PROBE_RSP) {
- lim_log(pMac, LOG2, FL("Learning scan probe rsp"));
+ lim_log(pMac, LOGD, FL("Learning scan probe rsp"));
lim_process_probe_rsp_frame_no_session(pMac, pRxPacketInfo);
} else {
lim_log(pMac, LOGE,
@@ -972,11 +969,10 @@ lim_handle80211_frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, uint8_t *pDeferMsg
&sessionId);
if (psessionEntry == NULL) {
if (fc.subType == SIR_MAC_MGMT_AUTH) {
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("ProtVersion %d, Type %d, Subtype %d rateIndex=%d"),
fc.protVer, fc.type, fc.subType,
WMA_GET_RX_MAC_RATE_IDX(pRxPacketInfo));
- lim_print_mac_addr(pMac, pHdr->bssId, LOG1);
if (lim_process_auth_frame_no_session
(pMac, pRxPacketInfo,
limMsg->bodyptr) == eSIR_SUCCESS) {
@@ -992,12 +988,12 @@ lim_handle80211_frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, uint8_t *pDeferMsg
psessionEntry = pe_find_session_by_peer_sta(pMac,
pHdr->sa, &sessionId);
if (psessionEntry == NULL) {
- lim_log(pMac, LOG3,
+ lim_log(pMac, LOGE,
FL("session does not exist for bssId"));
- lim_print_mac_addr(pMac, pHdr->sa, LOG3);
+ lim_print_mac_addr(pMac, pHdr->sa, LOGE);
goto end;
} else {
- lim_log(pMac, LOG3,
+ lim_log(pMac, LOGD,
"SessionId:%d exists for given Bssid",
psessionEntry->peSessionId);
}
@@ -1012,7 +1008,7 @@ lim_handle80211_frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, uint8_t *pDeferMsg
/* Check if frame is registered by HDD */
if (lim_check_mgmt_registered_frames(pMac, pRxPacketInfo, psessionEntry)) {
- lim_log(pMac, LOG1, FL("Received frame is passed to SME"));
+ lim_log(pMac, LOGD, FL("Received frame is passed to SME"));
goto end;
}
@@ -1202,7 +1198,7 @@ static QDF_STATUS lim_send_stop_scan_offload_req(tpAniSirGlobal pMac,
return QDF_STATUS_E_FAILURE;
}
- lim_log(pMac, LOG1, FL("Abort ongoing offload scan."));
+ lim_log(pMac, LOGD, FL("Abort ongoing offload scan."));
return QDF_STATUS_SUCCESS;
}
@@ -1225,7 +1221,7 @@ void lim_process_abort_scan_ind(tpAniSirGlobal mac_ctx,
NULL, 0, 0);
#endif
- lim_log(mac_ctx, LOG2, FL("scan_id %d, scan_requestor_id 0x%x"),
+ lim_log(mac_ctx, LOGD, FL("scan_id %d, scan_requestor_id 0x%x"),
scan_id, scan_requestor_id);
/* send stop scan cmd to firmware */
@@ -1245,20 +1241,20 @@ static void lim_process_sme_obss_scan_ind(tpAniSirGlobal mac_ctx,
session = pe_find_session_by_bssid(mac_ctx,
ht40_scanind->mac_addr.bytes, &session_id);
if (session == NULL) {
- QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
"OBSS Scan not started: session id is NULL");
return;
}
if (session->htSupportedChannelWidthSet ==
WNI_CFG_CHANNEL_BONDING_MODE_ENABLE) {
- QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
"OBSS Scan Start Req: session id %d"
"htSupportedChannelWidthSet %d",
session->peSessionId,
session->htSupportedChannelWidthSet);
lim_send_ht40_obss_scanind(mac_ctx, session);
} else {
- QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
"OBSS Scan not started: channel width - %d session %d",
session->htSupportedChannelWidthSet,
session->peSessionId);
@@ -1396,18 +1392,15 @@ static void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
break;
}
- if (WMA_GET_ROAMCANDIDATEIND(new_msg.bodyptr))
- lim_log(mac_ctx, LOG1, FL("roamCandidateInd %d"),
- WMA_GET_ROAMCANDIDATEIND(new_msg.bodyptr));
-
- if (WMA_GET_OFFLOADSCANLEARN(new_msg.bodyptr))
- lim_log(mac_ctx, LOG1, FL("offloadScanLearn %d"),
+ lim_log(mac_ctx, LOGD,
+ FL("roamCandidateInd: %d offloadScanLearn: %d"),
+ WMA_GET_ROAMCANDIDATEIND(new_msg.bodyptr),
WMA_GET_OFFLOADSCANLEARN(new_msg.bodyptr));
lim_handle80211_frames(mac_ctx, &new_msg, &defer_msg);
if (defer_msg == true) {
- QDF_TRACE(QDF_MODULE_ID_PE, LOG1,
+ QDF_TRACE(QDF_MODULE_ID_PE, LOGD,
FL("Defer Msg type=%x"), msg->type);
if (lim_defer_msg(mac_ctx, msg) != TX_SUCCESS) {
QDF_TRACE(QDF_MODULE_ID_PE, LOGE,
@@ -1521,7 +1514,7 @@ static void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
break;
case SIR_HAL_P2P_NOA_START_IND:
session_entry = &mac_ctx->lim.gpSession[0];
- lim_log(mac_ctx, LOG1, "LIM received NOA start %x", msg->type);
+ lim_log(mac_ctx, LOGD, "LIM received NOA start %x", msg->type);
/* Since insert NOA is done and NOA start msg received,
* we should deactivate the Insert NOA timer
@@ -1565,8 +1558,8 @@ static void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
session_entry = pe_find_session_by_sta_id(mac_ctx,
tdls_ind->staIdx, &session_id);
if (session_entry == NULL) {
- lim_log(mac_ctx, LOG1,
- FL("No session exist for given bssId"));
+ lim_log(mac_ctx, LOGD,
+ FL("No session exist for given bssId"));
qdf_mem_free(msg->bodyptr);
msg->bodyptr = NULL;
return;
@@ -1574,7 +1567,7 @@ static void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
sta_ds = dph_get_hash_entry(mac_ctx, tdls_ind->assocId,
&session_entry->dph.dphHashTable);
if (sta_ds == NULL) {
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("No sta_ds exist for given staId"));
qdf_mem_free(msg->bodyptr);
msg->bodyptr = NULL;
@@ -1594,7 +1587,7 @@ static void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
#endif
case SIR_HAL_P2P_NOA_ATTR_IND:
session_entry = &mac_ctx->lim.gpSession[0];
- lim_log(mac_ctx, LOG1, FL("Received message Noa_ATTR %x"),
+ lim_log(mac_ctx, LOGD, FL("Received message Noa_ATTR %x"),
msg->type);
for (i = 0; i < mac_ctx->lim.maxBssId; i++) {
session_entry = &mac_ctx->lim.gpSession[i];
@@ -1605,7 +1598,7 @@ static void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
&session_entry->p2pGoPsUpdate,
msg->bodyptr,
sizeof(tSirP2PNoaAttr));
- lim_log(mac_ctx, LOG2,
+ lim_log(mac_ctx, LOGD,
FL("bssId"
MAC_ADDRESS_STR
" ctWin=%d oppPsFlag=%d"),
@@ -1613,7 +1606,7 @@ static void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
session_entry->bssId),
session_entry->p2pGoPsUpdate.ctWin,
session_entry->p2pGoPsUpdate.oppPsFlag);
- lim_log(mac_ctx, LOG2,
+ lim_log(mac_ctx, LOGD,
FL
(" uNoa1IntervalCnt=%d uNoa1Duration=%d uNoa1Interval=%d uNoa1StartTime=%d"),
session_entry->p2pGoPsUpdate.uNoa1IntervalCnt,
@@ -1725,7 +1718,7 @@ static void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
case SIR_HAL_TDLS_SHOULD_DISCOVER:
case SIR_HAL_TDLS_SHOULD_TEARDOWN:
case SIR_HAL_TDLS_PEER_DISCONNECTED:
- QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
("%s received tdls event: 0x%x"), __func__, msg->type);
lim_send_sme_tdls_event_notify(mac_ctx, msg->type,
(void *)msg->bodyptr);
@@ -2232,10 +2225,10 @@ void lim_log_session_states(tpAniSirGlobal mac_ctx)
for (i = 0; i < mac_ctx->lim.maxBssId; i++) {
if (mac_ctx->lim.gpSession[i].valid) {
- QDF_TRACE(QDF_MODULE_ID_PE, LOG1,
+ QDF_TRACE(QDF_MODULE_ID_PE, LOGD,
FL("sysRole(%d) Session (%d)"),
mac_ctx->lim.gLimSystemRole, i);
- QDF_TRACE(QDF_MODULE_ID_PE, LOG1,
+ QDF_TRACE(QDF_MODULE_ID_PE, LOGD,
FL("SME: Curr %s,Prev %s,MLM: Curr %s,Prev %s"),
lim_sme_state_str(
mac_ctx->lim.gpSession[i].limSmeState),
diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
index 1702308212dd..893cfc501764 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
@@ -1970,7 +1970,7 @@ lim_process_mlm_set_keys_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
return;
}
- lim_log(mac_ctx, LOGW,
+ lim_log(mac_ctx, LOGD,
FL("Received MLM_SETKEYS_REQ with parameters:"
"AID [%d], ED Type [%d], # Keys [%d] & Peer MAC Addr - "),
mlm_set_keys_req->aid, mlm_set_keys_req->edType,
@@ -1989,7 +1989,7 @@ lim_process_mlm_set_keys_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
&mlm_set_keys_req->peer_macaddr)) &&
(!qdf_is_macaddr_equal(&mlm_set_keys_req->peer_macaddr,
&curr_bssid))) {
- lim_log(mac_ctx, LOGW,
+ lim_log(mac_ctx, LOGD,
FL("Received MLM_SETKEYS_REQ with invalid BSSID"
MAC_ADDRESS_STR),
MAC_ADDR_ARRAY(mlm_set_keys_req->
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 dee3c7e15442..e7ea52e3403f 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
@@ -216,7 +216,7 @@ void lim_process_mlm_start_cnf(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
/* Start BSS is a failure */
pe_delete_session(pMac, psessionEntry);
psessionEntry = NULL;
- PELOGE(lim_log(pMac, LOGE, FL("Start BSS Failed "));)
+ lim_log(pMac, LOGE, FL("Start BSS Failed "));
}
/* Send response to Host */
lim_send_sme_start_bss_rsp(pMac, eWNI_SME_START_BSS_RSP,
@@ -253,7 +253,7 @@ void lim_process_mlm_start_cnf(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
}
if (send_bcon_ind) {
/* Configure beacon and send beacons to HAL */
- QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
FL("Start Beacon with ssid %s Ch %d"),
psessionEntry->ssId.ssId,
psessionEntry->currentOperChannel);
@@ -347,7 +347,7 @@ static void lim_send_mlm_assoc_req(tpAniSirGlobal mac_ctx,
tpSirMacCapabilityInfo cap_info;
/* Successful MAC based authentication. Trigger Association with BSS */
- lim_log(mac_ctx, LOG1, FL("SessionId:%d Authenticated with BSS"),
+ lim_log(mac_ctx, LOGD, FL("SessionId:%d Authenticated with BSS"),
session_entry->peSessionId);
if (NULL == session_entry->pLimJoinReq) {
@@ -396,7 +396,7 @@ static void lim_send_mlm_assoc_req(tpAniSirGlobal mac_ctx,
if (!(session_entry->pLimJoinReq->bssDescription.capabilityInfo &
(LIM_SHORT_PREAMBLE_BIT_MASK))) {
caps &= (~LIM_SHORT_PREAMBLE_BIT_MASK);
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Clearing short preamble:no AP support"));
}
@@ -404,7 +404,7 @@ static void lim_send_mlm_assoc_req(tpAniSirGlobal mac_ctx,
if (!(session_entry->pLimJoinReq->bssDescription.capabilityInfo &
(LIM_IMMEDIATE_BLOCK_ACK_MASK))) {
caps &= (~LIM_IMMEDIATE_BLOCK_ACK_MASK);
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Clearing Immed Blk Ack:no AP support"));
}
@@ -690,7 +690,8 @@ void lim_process_mlm_assoc_cnf(tpAniSirGlobal mac_ctx,
}
if (((tLimMlmAssocCnf *) msg)->resultCode != eSIR_SME_SUCCESS) {
/* Association failure */
- lim_log(mac_ctx, LOG1, FL("SessionId:%d Association failure resultCode: %d limSmeState:%d"),
+ lim_log(mac_ctx, LOGE,
+ FL("SessionId:%d Association failure resultCode: %d limSmeState:%d"),
session_entry->peSessionId,
((tLimMlmAssocCnf *) msg)->resultCode,
session_entry->limSmeState);
@@ -717,7 +718,7 @@ void lim_process_mlm_assoc_cnf(tpAniSirGlobal mac_ctx,
session_entry);
} else {
/* Successful Association */
- lim_log(mac_ctx, LOG1, FL("SessionId:%d Associated with BSS"),
+ lim_log(mac_ctx, LOGD, FL("SessionId:%d Associated with BSS"),
session_entry->peSessionId);
session_entry->limSmeState = eLIM_SME_LINK_EST_STATE;
MTRACE(mac_trace(mac_ctx, TRACE_CODE_SME_STATE,
@@ -889,10 +890,8 @@ void lim_process_mlm_assoc_ind(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
#endif /* FEATURE_WLAN_DIAG_SUPPORT */
lim_sys_process_mmh_msg_api(pMac, &msgQ, ePROT);
- PELOG1(lim_log(pMac, LOG1,
- FL
- ("Create CNF_WAIT_TIMER after received LIM_MLM_ASSOC_IND"));
- )
+ lim_log(pMac, LOGD,
+ FL("Create CNF_WAIT_TIMER after received LIM_MLM_ASSOC_IND"));
/*
** turn on a timer to detect the loss of ASSOC CNF
**/
@@ -942,10 +941,9 @@ void lim_process_mlm_disassoc_ind(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
psessionEntry->limSmeState));
break;
default: /* eLIM_AP_ROLE */
- PELOG1(lim_log(pMac, LOG1,
- FL("*** Peer staId=%d Disassociated ***"),
+ lim_log(pMac, LOGD,
+ FL("*** Peer staId=%d Disassociated ***"),
pMlmDisassocInd->aid);
- )
/* Send SME_DISASOC_IND after Polaris cleanup */
/* (after receiving LIM_MLM_PURGE_STA_IND) */
break;
@@ -1077,11 +1075,9 @@ void lim_process_mlm_deauth_ind(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
default: /* eLIM_AP_ROLE */
{
- PELOG1(lim_log(pMac, LOG1,
- FL
- ("*** Received Deauthentication from staId=%d ***"),
+ lim_log(pMac, LOGD,
+ FL("*** Received Deauthentication from staId=%d ***"),
pMlmDeauthInd->aid);
- )
}
/* Send SME_DEAUTH_IND after Polaris cleanup */
/* (after receiving LIM_MLM_PURGE_STA_IND) */
@@ -1153,8 +1149,8 @@ void lim_process_mlm_deauth_cnf(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
}
if (pMlmDeauthCnf->resultCode == eSIR_SME_SUCCESS) {
psessionEntry->limSmeState = eLIM_SME_IDLE_STATE;
- PELOG1(lim_log(pMac, LOG1,
- FL("*** Deauthenticated with BSS ***"));)
+ lim_log(pMac, LOGD,
+ FL("*** Deauthenticated with BSS ***"));
} else
psessionEntry->limSmeState =
psessionEntry->limPrevSmeState;
@@ -1234,10 +1230,10 @@ void lim_process_mlm_purge_sta_ind(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
)
break;
}
- PELOG1(lim_log(pMac, LOG1,
- FL("*** Cleanup completed for staId=%d ***"),
+ lim_log(pMac, LOGD,
+ FL("*** Cleanup completed for staId=%d ***"),
pMlmPurgeStaInd->aid);
- )
+
if (LIM_IS_STA_ROLE(psessionEntry)) {
psessionEntry->limSmeState = eLIM_SME_IDLE_STATE;
MTRACE(mac_trace
@@ -1324,7 +1320,7 @@ void lim_process_mlm_set_keys_cnf(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
sta_ds->is_key_installed = 1;
}
}
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("is_key_installed = %d"),
psessionEntry->is_key_installed);
@@ -1714,10 +1710,9 @@ void lim_process_sta_mlm_del_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ,
statusCode = eSIR_SME_REFUSED;
goto end;
}
- PELOG1(lim_log
- (pMac, LOG1, FL("STA AssocID %d MAC "), pStaDs->assocId);
- lim_print_mac_addr(pMac, pStaDs->staAddr, LOG1);
- )
+ lim_log(pMac, LOGD, FL("STA AssocID %d MAC "),
+ pStaDs->assocId);
+ lim_print_mac_addr(pMac, pStaDs->staAddr, LOGD);
} else {
lim_log(pMac, LOGE, FL("DEL BSS failed!"));
statusCode = eSIR_SME_STOP_BSS_FAILURE;
@@ -1898,7 +1893,7 @@ void lim_process_ap_mlm_del_sta_rsp(tpAniSirGlobal mac_ctx,
msg->bodyptr = NULL;
return;
}
- lim_log(mac_ctx, LOG1, FL("Received del Sta Rsp in StaD MlmState : %d"),
+ lim_log(mac_ctx, LOGD, FL("Received del Sta Rsp in StaD MlmState : %d"),
sta_ds->mlmStaContext.mlmState);
if (QDF_STATUS_SUCCESS != del_sta_params->status) {
lim_log(mac_ctx, LOGW, FL("DEL STA failed!"));
@@ -1920,9 +1915,9 @@ void lim_process_ap_mlm_del_sta_rsp(tpAniSirGlobal mac_ctx,
goto end;
}
- lim_log(mac_ctx, LOG1, FL("Deleted STA AssocID %d staId %d MAC "),
+ lim_log(mac_ctx, LOGD, FL("Deleted STA AssocID %d staId %d MAC "),
sta_ds->assocId, sta_ds->staIndex);
- lim_print_mac_addr(mac_ctx, sta_ds->staAddr, LOG1);
+ lim_print_mac_addr(mac_ctx, sta_ds->staAddr, LOGD);
if (eLIM_MLM_WT_ASSOC_DEL_STA_RSP_STATE ==
sta_ds->mlmStaContext.mlmState) {
qdf_mem_free(del_sta_params);
@@ -1980,12 +1975,12 @@ void lim_process_sta_mlm_del_sta_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ,
lim_log(pMac, LOGE, FL("Encountered NULL Pointer"));
goto end;
}
- lim_log(pMac, LOG1, FL("Del STA RSP received. Status:%d AssocID:%d"),
+ lim_log(pMac, LOGD, FL("Del STA RSP received. Status:%d AssocID:%d"),
pDelStaParams->status, pDelStaParams->assocId);
#ifdef FEATURE_WLAN_TDLS
if (pDelStaParams->staType == STA_ENTRY_TDLS_PEER) {
- lim_log(pMac, LOG1, FL("TDLS Del STA RSP received."));
+ lim_log(pMac, LOGD, FL("TDLS Del STA RSP received."));
lim_process_tdls_del_sta_rsp(pMac, limMsgQ, psessionEntry);
return;
}
@@ -2010,8 +2005,8 @@ void lim_process_sta_mlm_del_sta_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ,
statusCode = eSIR_SME_REFUSED;
goto end;
}
- lim_log(pMac, LOG1, FL("STA AssocID %d MAC "), pStaDs->assocId);
- lim_print_mac_addr(pMac, pStaDs->staAddr, LOG1);
+ lim_log(pMac, LOGD, FL("STA AssocID %d MAC "), pStaDs->assocId);
+ lim_print_mac_addr(pMac, pStaDs->staAddr, LOGD);
/*
* we must complete all cleanup related to delSta before
* calling limDelBSS.
@@ -2085,10 +2080,10 @@ void lim_process_ap_mlm_add_sta_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ,
/* if the AssocRsp frame is not acknowledged, then keep alive timer will take care of the state */
pStaDs->valid = 1;
pStaDs->mlmStaContext.mlmState = eLIM_MLM_WT_ASSOC_CNF_STATE;
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("AddStaRsp Success.STA AssocID %d staId %d MAC "),
pStaDs->assocId, pStaDs->staIndex);
- lim_print_mac_addr(pMac, pStaDs->staAddr, LOG1);
+ lim_print_mac_addr(pMac, pStaDs->staAddr, LOGD);
/* For BTAMP-AP, the flow sequence shall be:
* 1) PE sends eWNI_SME_ASSOC_IND to SME
@@ -2206,12 +2201,12 @@ static void lim_process_ap_mlm_add_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg
if (psessionEntry->privacy) {
if ((psessionEntry->gStartBssRSNIe.present)
|| (psessionEntry->gStartBssWPAIe.present))
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("WPA/WPA2 SAP configuration"));
else {
if (pMac->lim.gLimAssocStaLimit >
MAX_SUPPORTED_PEERS_WEP) {
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("WEP SAP Configuration"));
pMac->lim.gLimAssocStaLimit =
MAX_SUPPORTED_PEERS_WEP;
@@ -2297,10 +2292,9 @@ lim_process_ibss_mlm_add_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ,
goto end;
}
if (QDF_STATUS_SUCCESS == pAddBssParams->status) {
- PELOG1(lim_log
- (pMac, LOG1,
- FL("WMA_ADD_BSS_RSP returned with QDF_STATUS_SUCCESS"));
- )
+ lim_log(pMac, LOGD,
+ FL("WMA_ADD_BSS_RSP returned with QDF_STATUS_SUCCESS"));
+
if (lim_set_link_state
(pMac, eSIR_LINK_IBSS_STATE, psessionEntry->bssId,
psessionEntry->selfMacAddr, NULL,
@@ -2443,7 +2437,7 @@ lim_process_sta_add_bss_rsp_pre_assoc(tpAniSirGlobal mac_ctx,
MTRACE(mac_trace(mac_ctx, TRACE_CODE_SME_STATE,
session_entry->peSessionId,
session_entry->limSmeState));
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("SessionId:%d lim_post_mlm_message "
"LIM_MLM_AUTH_REQ with limSmeState:%d"),
session_entry->peSessionId, session_entry->limSmeState);
@@ -2500,7 +2494,7 @@ lim_process_sta_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx,
if (eLIM_MLM_WT_ADD_BSS_RSP_PREASSOC_STATE ==
session_entry->limMlmState) {
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
"SessionId:%d lim_process_sta_add_bss_rsp_pre_assoc",
session_entry->peSessionId);
lim_process_sta_add_bss_rsp_pre_assoc(mac_ctx, msg,
@@ -2539,7 +2533,7 @@ lim_process_sta_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx,
if (QDF_STATUS_SUCCESS == add_bss_params->status) {
if (eLIM_MLM_WT_ADD_BSS_RSP_FT_REASSOC_STATE ==
session_entry->limMlmState) {
- lim_log(mac_ctx, LOG1, FL("Mlm=%d %d"),
+ lim_log(mac_ctx, LOGD, FL("Mlm=%d %d"),
session_entry->limMlmState,
eLIM_MLM_WT_ADD_BSS_RSP_REASSOC_STATE);
lim_process_sta_mlm_add_bss_rsp_ft(mac_ctx, msg,
@@ -3043,7 +3037,7 @@ static void lim_process_switch_channel_join_req(
session_entry->limPrevMlmState = session_entry->limMlmState;
session_entry->limMlmState = eLIM_MLM_WT_JOIN_BEACON_STATE;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Sessionid %d prev lim state %d new lim state %d "
"systemrole = %d"), session_entry->peSessionId,
session_entry->limPrevMlmState,
@@ -3092,7 +3086,7 @@ static void lim_process_switch_channel_join_req(
/* assign appropriate sessionId to the timer object */
mac_ctx->lim.limTimers.gLimPeriodicJoinProbeReqTimer.sessionId =
session_entry->peSessionId;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Sessionid: %d Send Probe req on channel %d ssid:%.*s "
"BSSID: " MAC_ADDRESS_STR), session_entry->peSessionId,
session_entry->currentOperChannel, ssId.length, ssId.ssId,
@@ -3202,7 +3196,7 @@ void lim_process_switch_channel_rsp(tpAniSirGlobal pMac, void *body)
psessionEntry->chainMask = pChnlParams->chainMask;
psessionEntry->smpsMode = pChnlParams->smpsMode;
psessionEntry->channelChangeReasonCode = 0xBAD;
- lim_log(pMac, LOG1, FL("channelChangeReasonCode %d"),
+ lim_log(pMac, LOGD, FL("channelChangeReasonCode %d"),
channelChangeReasonCode);
switch (channelChangeReasonCode) {
case LIM_SWITCH_CHANNEL_REASSOC:
@@ -3220,10 +3214,9 @@ void lim_process_switch_channel_rsp(tpAniSirGlobal pMac, void *body)
* We can get rid of the reason code here.
*/
if (pMac->lim.gpchangeChannelCallback) {
- PELOG1(lim_log
- (pMac, LOG1,
- "Channel changed hence invoke registered call back");
- )
+ lim_log(pMac, LOGD,
+ "Channel changed hence invoke registered call back");
+
pMac->lim.gpchangeChannelCallback(pMac, status,
pMac->lim.
gpchangeChannelData,
@@ -3234,7 +3227,7 @@ void lim_process_switch_channel_rsp(tpAniSirGlobal pMac, void *body)
*/
cds_update_connection_info(psessionEntry->smeSessionId);
if (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) {
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("Send p2p operating channel change conf action frame once first beacon is received on new channel"));
psessionEntry->send_p2p_conf_frame = true;
}
@@ -3346,7 +3339,8 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf)
case SIR_SCAN_EVENT_STARTED:
break;
case SIR_SCAN_EVENT_COMPLETED:
- lim_log(pMac, LOG1, FL("No.of beacons and probe response received per scan %d"),
+ lim_log(pMac, LOGD,
+ FL("No.of beacons and probe response received per scan %d"),
pMac->lim.beacon_probe_rsp_cnt_per_scan);
#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */
lim_diag_event_report(pMac, WLAN_PE_DIAG_SCAN_COMPLETE_EVENT, NULL,
diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
index afc3e1dbd99b..f007ece92ed0 100644
--- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
@@ -167,7 +167,7 @@ static QDF_STATUS lim_process_set_hw_mode(tpAniSirGlobal mac, uint32_t *msg)
cds_message.bodyptr = req_msg;
cds_message.type = SIR_HAL_PDEV_SET_HW_MODE;
- lim_log(mac, LOG1, FL("Posting SIR_HAL_SOC_SET_HW_MOD to WMA"));
+ lim_log(mac, LOGD, FL("Posting SIR_HAL_SOC_SET_HW_MOD to WMA"));
status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
if (!QDF_IS_STATUS_SUCCESS(status)) {
lim_log(mac, LOGE,
@@ -238,7 +238,7 @@ static QDF_STATUS lim_process_set_dual_mac_cfg_req(tpAniSirGlobal mac,
cds_message.bodyptr = req_msg;
cds_message.type = SIR_HAL_PDEV_DUAL_MAC_CFG_REQ;
- lim_log(mac, LOG1,
+ lim_log(mac, LOGD,
FL("Post SIR_HAL_PDEV_DUAL_MAC_CFG_REQ to WMA: %x %x"),
req_msg->scan_config, req_msg->fw_mode_config);
status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
@@ -303,7 +303,7 @@ static QDF_STATUS lim_process_set_antenna_mode_req(tpAniSirGlobal mac,
cds_message.bodyptr = req_msg;
cds_message.type = SIR_HAL_SOC_ANTENNA_MODE_REQ;
- lim_log(mac, LOG1,
+ lim_log(mac, LOGD,
FL("Post SIR_HAL_SOC_ANTENNA_MODE_REQ to WMA: %d %d"),
req_msg->num_rx_chains,
req_msg->num_tx_chains);
@@ -349,11 +349,11 @@ __lim_fresh_scan_reqd(tpAniSirGlobal mac_ctx, uint8_t return_fresh_results)
uint8_t valid_state = true;
int i;
- lim_log(mac_ctx, LOG1, FL("gLimSmeState: %d, returnFreshResults 0x%x"),
+ lim_log(mac_ctx, LOGD, FL("gLimSmeState: %d, returnFreshResults 0x%x"),
mac_ctx->lim.gLimSmeState, return_fresh_results);
if (mac_ctx->lim.gLimSmeState != eLIM_SME_IDLE_STATE) {
- lim_log(mac_ctx, LOG1, FL("return FALSE"));
+ lim_log(mac_ctx, LOGD, FL("return FALSE"));
return false;
}
@@ -362,7 +362,7 @@ __lim_fresh_scan_reqd(tpAniSirGlobal mac_ctx, uint8_t return_fresh_results)
if (mac_ctx->lim.gpSession[i].valid == false)
continue;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("session %d, bsstype %d, limSystemRole %d, limSmeState %d"),
i, mac_ctx->lim.gpSession[i].bssType,
mac_ctx->lim.gpSession[i].limSystemRole,
@@ -398,7 +398,7 @@ __lim_fresh_scan_reqd(tpAniSirGlobal mac_ctx, uint8_t return_fresh_results)
break;
}
- lim_log(mac_ctx, LOG1, FL("valid_state: %d"), valid_state);
+ lim_log(mac_ctx, LOGD, FL("valid_state: %d"), valid_state);
if ((valid_state) &&
(return_fresh_results & SIR_BG_SCAN_RETURN_FRESH_RESULTS))
@@ -489,7 +489,7 @@ static bool __lim_is_defered_msg_for_learn(tpAniSirGlobal pMac, tpSirMsgQ pMsg)
pMsg->type);
return false;
}
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("Defer the message, in learn mode type = %d"),
pMsg->type);
return true;
@@ -525,7 +525,7 @@ __lim_is_defered_msg_for_radar(tpAniSirGlobal mac_ctx, tpSirMsgQ message)
message->type);
return false;
}
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Defer the message, in learn mode type = %d"),
message->type);
return true;
@@ -559,7 +559,7 @@ static bool __lim_process_sme_sys_ready_ind(tpAniSirGlobal pMac, uint32_t *pMsgB
pe_register_callbacks_with_wma(pMac, ready_req);
pMac->lim.add_bssdescr_callback = ready_req->add_bssdescr_cb;
}
- PELOGW(lim_log(pMac, LOGW, FL("sending WMA_SYS_READY_IND msg to HAL"));)
+ lim_log(pMac, LOGD, FL("sending WMA_SYS_READY_IND msg to HAL"));
MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msg.type));
if (eSIR_SUCCESS != wma_post_ctrl_msg(pMac, &msg)) {
@@ -656,7 +656,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
NULL, 0, 0);
#endif /* FEATURE_WLAN_DIAG_SUPPORT */
- lim_log(mac_ctx, LOG1, FL("Received START_BSS_REQ"));
+ lim_log(mac_ctx, LOGD, FL("Received START_BSS_REQ"));
size = sizeof(tSirSmeStartBssReq);
sme_start_bss_req = qdf_mem_malloc(size);
if (NULL == sme_start_bss_req) {
@@ -800,7 +800,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
#ifdef WLAN_FEATURE_11W
session->limRmfEnabled =
sme_start_bss_req->pmfCapable ? 1 : 0;
- lim_log(mac_ctx, LOG1, FL("Session RMF enabled: %d"),
+ lim_log(mac_ctx, LOGD, FL("Session RMF enabled: %d"),
session->limRmfEnabled);
#endif
@@ -856,7 +856,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
break;
}
- lim_log(mac_ctx, LOG1, FL("persona - %d, nss - %d"),
+ lim_log(mac_ctx, LOGD, FL("persona - %d, nss - %d"),
session->pePersona, session->vdev_nss);
session->nss = session->vdev_nss;
/*
@@ -899,7 +899,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
FL("cbMode %u"), sme_start_bss_req->cbMode);
if (session->vhtCapability || session->htCapability) {
chanwidth = sme_start_bss_req->vht_channel_width;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("vht_channel_width %u htSupportedChannelWidthSet %d"),
sme_start_bss_req->vht_channel_width,
session->htSupportedChannelWidthSet);
@@ -918,10 +918,10 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
if (session->vhtCapability &&
(session->ch_width > CH_WIDTH_80MHZ)) {
session->nss = 1;
- lim_log(mac_ctx, LOG1, FL("nss set to [%d]"),
+ lim_log(mac_ctx, LOGD, FL("nss set to [%d]"),
session->nss);
}
- lim_log(mac_ctx, LOG1, FL("vht su tx bformer %d"),
+ lim_log(mac_ctx, LOGD, FL("vht su tx bformer %d"),
session->vht_config.su_beam_former);
/* Delete pre-auth list if any */
@@ -1234,18 +1234,18 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac,
if (eSIR_SUCCESS != status) {
extcap_present = false;
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("Unable to Strip ExtCap IE from Scan Req"));
}
if (extcap_present) {
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("Extcap was part of SCAN IE - Updating FW"));
lim_send_ext_cap_ie(pMac, pScanReq->sessionId,
&extracted_extcap, true);
}
} else {
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("No IEs in the scan request from supplicant"));
}
@@ -1358,7 +1358,7 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac,
return QDF_STATUS_E_FAILURE;
}
- lim_log(pMac, LOG1, FL("Processed Offload Scan Request Successfully"));
+ lim_log(pMac, LOGD, FL("Processed Offload Scan Request Successfully"));
return QDF_STATUS_SUCCESS;
}
@@ -1387,7 +1387,7 @@ static void __lim_process_sme_scan_req(tpAniSirGlobal mac_ctx,
mac_ctx->lim.beacon_probe_rsp_cnt_per_scan = 0;
scan_req = (tpSirSmeScanReq) msg_buf;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("SME SCAN REQ id %d numChan %d min %d max %d IELen %d first %d fresh %d unique %d type %s (%d) rsp %d"),
scan_req->scan_id, scan_req->channelList.numChannels,
scan_req->minChannelTime, scan_req->maxChannelTime,
@@ -1679,7 +1679,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
((uint8_t *)&bss_desc->ieFields), ie_len);
if (NULL != vendor_ie) {
- lim_log(mac_ctx, LOG1, FL("Cisco vendor OUI present"));
+ lim_log(mac_ctx, LOGD, FL("Cisco vendor OUI present"));
session->isCiscoVendorAP = true;
} else {
session->isCiscoVendorAP = false;
@@ -1706,7 +1706,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
session->supported_nss_1x1 = true;
/*Store Persona */
session->pePersona = sme_join_req->staPersona;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("enable Smps: %d mode: %d send action: %d supported nss 1x1: %d pePersona %d cbMode %d"),
session->enableHtSmps,
session->htSmpsvalue,
@@ -1744,11 +1744,11 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
sme_join_req->enableVhtpAid;
session->enableVhtGid =
sme_join_req->enableVhtGid;
- lim_log(mac_ctx, LOG1, FL("vht su bformer [%d]"),
+ lim_log(mac_ctx, LOGD, FL("vht su bformer [%d]"),
session->vht_config.su_beam_former);
}
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("vhtCapability: %d su_beam_formee: %d txbf_csn_value: %d su_tx_bformer %d"),
session->vhtCapability,
session->vht_config.su_beam_formee,
@@ -1915,14 +1915,14 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
local_power_constraint,
mac_ctx->roam.configParam.nTxPowerCap);
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Reg max %d local power con %d max tx pwr %d"),
reg_max, local_power_constraint, session->maxTxPower);
if (session->gLimCurrentBssUapsd) {
session->gUapsdPerAcBitmask =
session->pLimJoinReq->uapsdPerAcBitmask;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("UAPSD flag for all AC - 0x%2x"),
session->gUapsdPerAcBitmask);
@@ -2005,7 +2005,7 @@ end:
session = NULL;
}
}
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Send failure status on sessionid: %d with ret_code = %d"),
sme_session_id, ret_code);
lim_send_sme_join_reassoc_rsp(mac_ctx, eWNI_SME_JOIN_RSP, ret_code,
@@ -2127,11 +2127,11 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx,
reassoc_req->enableVhtpAid;
session_entry->enableVhtGid =
reassoc_req->enableVhtGid;
- lim_log(mac_ctx, LOG1, FL("vht su bformer [%d]"),
+ lim_log(mac_ctx, LOGD, FL("vht su bformer [%d]"),
session_entry->vht_config.su_beam_former);
}
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("vhtCapability: %d su_beam_formee: %d su_tx_bformer %d"),
session_entry->vhtCapability,
session_entry->vht_config.su_beam_formee,
@@ -2141,7 +2141,7 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx,
session_entry->htSmpsvalue = reassoc_req->htSmps;
session_entry->send_smps_action =
reassoc_req->send_smps_action;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("enableHtSmps: %d htSmps: %d send action: %d supported nss 1x1: %d"),
session_entry->enableHtSmps,
session_entry->htSmpsvalue,
@@ -2158,7 +2158,7 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx,
* May be from 11r FT pre-auth. So lets check it
* before we bail out
*/
- lim_log(mac_ctx, LOG1, FL(
+ lim_log(mac_ctx, LOGD, FL(
"Session in reassoc state is %d"),
session_entry->peSessionId);
@@ -2231,7 +2231,7 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx,
if (session_entry->gLimCurrentBssUapsd) {
session_entry->gUapsdPerAcBitmask =
session_entry->pLimReAssocReq->uapsdPerAcBitmask;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("UAPSD flag for all AC - 0x%2x"),
session_entry->gUapsdPerAcBitmask);
}
@@ -2271,7 +2271,7 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx,
lim_update_caps_info_for_bss(mac_ctx, &caps,
reassoc_req->bssDescription.capabilityInfo);
- lim_log(mac_ctx, LOG1, FL("Capabilities info Reassoc: 0x%X"), caps);
+ lim_log(mac_ctx, LOGD, FL("Capabilities info Reassoc: 0x%X"), caps);
mlm_reassoc_req->capabilityInfo = caps;
@@ -2404,8 +2404,8 @@ static void __lim_process_sme_disassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBu
if (!lim_is_sme_disassoc_req_valid(pMac,
&smeDisassocReq,
psessionEntry)) {
- PELOGE(lim_log(pMac, LOGE,
- FL("received invalid SME_DISASSOC_REQ message"));)
+ lim_log(pMac, LOGE,
+ FL("received invalid SME_DISASSOC_REQ message"));
if (pMac->lim.gLimRspReqd) {
pMac->lim.gLimRspReqd = false;
@@ -2429,7 +2429,7 @@ static void __lim_process_sme_disassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBu
disassocTrigger = eLIM_HOST_DISASSOC;
goto sendDisassoc;
}
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("received DISASSOC_REQ message on sessionid %d Systemrole %d Reason: %u SmeState: %d from: "
MAC_ADDRESS_STR), smesessionId,
GET_LIM_SYSTEM_ROLE(psessionEntry), smeDisassocReq.reasonCode,
@@ -2453,7 +2453,7 @@ static void __lim_process_sme_disassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBu
switch (psessionEntry->limSmeState) {
case eLIM_SME_ASSOCIATED_STATE:
case eLIM_SME_LINK_EST_STATE:
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("Rcvd SME_DISASSOC_REQ in limSmeState: %d "),
psessionEntry->limSmeState);
psessionEntry->limPrevSmeState =
@@ -2479,7 +2479,7 @@ static void __lim_process_sme_disassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBu
(pMac, TRACE_CODE_SME_STATE,
psessionEntry->peSessionId,
psessionEntry->limSmeState));
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("Rcvd SME_DISASSOC_REQ while in SME_WT_DEAUTH_STATE. "));
break;
@@ -2493,13 +2493,13 @@ static void __lim_process_sme_disassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBu
* It will send a disassoc, which is ok. However, we can use the global flag
* sendDisassoc to not send disassoc frame.
*/
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("Rcvd SME_DISASSOC_REQ while in SME_WT_DISASSOC_STATE. "));
break;
case eLIM_SME_JOIN_FAILURE_STATE: {
/* Already in Disconnected State, return success */
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("Rcvd SME_DISASSOC_REQ while in eLIM_SME_JOIN_FAILURE_STATE. "));
if (pMac->lim.gLimRspReqd) {
retCode = eSIR_SME_SUCCESS;
@@ -2554,11 +2554,11 @@ static void __lim_process_sme_disassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBu
reasonCode = smeDisassocReq.reasonCode;
if (smeDisassocReq.doNotSendOverTheAir) {
- lim_log(pMac, LOG1, FL("do not send dissoc over the air"));
+ lim_log(pMac, LOGD, FL("do not send dissoc over the air"));
send_disassoc_frame = 0;
}
/* Trigger Disassociation frame to peer MAC entity */
- lim_log(pMac, LOG1, FL("Sending Disasscoc with disassoc Trigger"
+ lim_log(pMac, LOGD, FL("Sending Disasscoc with disassoc Trigger"
" : %d, reasonCode : %d"),
disassocTrigger, reasonCode);
@@ -2619,7 +2619,7 @@ static void __lim_process_sme_disassoc_cnf(tpAniSirGlobal pMac, uint32_t *pMsgBu
tpPESession psessionEntry;
uint8_t sessionId;
- PELOG1(lim_log(pMac, LOG1, FL("received DISASSOC_CNF message"));)
+ lim_log(pMac, LOGD, FL("received DISASSOC_CNF message"));
qdf_mem_copy(&smeDisassocCnf, pMsgBuf,
sizeof(struct sSirSmeDisassocCnf));
@@ -2737,7 +2737,7 @@ static void __lim_process_sme_deauth_req(tpAniSirGlobal mac_ctx,
uint8_t sme_session_id;
uint16_t sme_transaction_id;
- lim_log(mac_ctx, LOG1, FL("received DEAUTH_REQ message"));
+ lim_log(mac_ctx, LOGD, FL("received DEAUTH_REQ message"));
qdf_mem_copy(&sme_deauth_req, msg_buf, sizeof(tSirSmeDeauthReq));
sme_session_id = sme_deauth_req.sessionId;
@@ -2768,7 +2768,7 @@ static void __lim_process_sme_deauth_req(tpAniSirGlobal mac_ctx,
deauth_trigger = eLIM_HOST_DEAUTH;
goto send_deauth;
}
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("received DEAUTH_REQ sessionid %d Systemrole %d reasoncode %u limSmestate %d from "
MAC_ADDRESS_STR), sme_session_id,
GET_LIM_SYSTEM_ROLE(session_entry), sme_deauth_req.reasonCode,
@@ -2811,7 +2811,7 @@ static void __lim_process_sme_deauth_req(tpAniSirGlobal mac_ctx,
* was sent for deauth/disassoc frame.
*/
session_entry->limSmeState = eLIM_SME_WT_DEAUTH_STATE;
- lim_log(mac_ctx, LOG1, FL(
+ lim_log(mac_ctx, LOGD, FL(
"Rcvd SME_DEAUTH_REQ while in SME_WT_DEAUTH_STATE"));
break;
default:
@@ -2880,7 +2880,7 @@ static void __lim_process_sme_deauth_req(tpAniSirGlobal mac_ctx,
if (sme_deauth_req.reasonCode == eLIM_LINK_MONITORING_DEAUTH) {
/* Deauthentication is triggered by Link Monitoring */
- lim_log(mac_ctx, LOG1, FL("** Lost link with AP **"));
+ lim_log(mac_ctx, LOGD, FL("** Lost link with AP **"));
deauth_trigger = eLIM_LINK_MONITORING_DEAUTH;
reason_code = eSIR_MAC_UNSPEC_FAILURE_REASON;
} else {
@@ -2943,7 +2943,7 @@ __lim_process_sme_set_context_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
uint8_t sme_session_id;
uint16_t sme_transaction_id;
- lim_log(mac_ctx, LOG1, FL("received SETCONTEXT_REQ message"));
+ lim_log(mac_ctx, LOGD, FL("received SETCONTEXT_REQ message"));
if (msg_buf == NULL) {
lim_log(mac_ctx, LOGE, FL("Buffer is Pointing to NULL"));
@@ -2982,7 +2982,7 @@ __lim_process_sme_set_context_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
session_entry = pe_find_session_by_bssid(mac_ctx,
set_context_req->bssid.bytes, &session_id);
if (session_entry == NULL) {
- lim_log(mac_ctx, LOGW,
+ lim_log(mac_ctx, LOGE,
FL("Session does not exist for given BSSID"));
lim_send_sme_set_context_rsp(mac_ctx,
set_context_req->peer_macaddr, 1,
@@ -3003,7 +3003,7 @@ __lim_process_sme_set_context_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
/* Trigger MLM_SETKEYS_REQ */
mlm_set_key_req = qdf_mem_malloc(sizeof(tLimMlmSetKeysReq));
if (NULL == mlm_set_key_req) {
- lim_log(mac_ctx, LOGP, FL(
+ lim_log(mac_ctx, LOGE, FL(
"mem alloc failed for mlmSetKeysReq"));
goto end;
}
@@ -3012,7 +3012,7 @@ __lim_process_sme_set_context_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
set_context_req->keyMaterial.numKeys;
if (mlm_set_key_req->numKeys >
SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS) {
- lim_log(mac_ctx, LOGP, FL(
+ lim_log(mac_ctx, LOGE, FL(
"no.of keys exceeded max num of default keys limit"));
goto end;
}
@@ -3027,7 +3027,7 @@ __lim_process_sme_set_context_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
mlm_set_key_req->sessionId = session_id;
mlm_set_key_req->smesessionId = sme_session_id;
- lim_log(mac_ctx, LOG1, FL(
+ lim_log(mac_ctx, LOGD, FL(
"received SETCONTEXT_REQ message sessionId=%d"),
mlm_set_key_req->sessionId);
@@ -3152,13 +3152,13 @@ static void lim_process_sme_get_assoc_sta_info(tpAniSirGlobal mac_ctx,
assoc_sta_tmp->Support40Mhz =
sta_ds->htDsssCckRate40MHzSupport;
- lim_log(mac_ctx, LOG1, FL("dph Station Number = %d"),
+ lim_log(mac_ctx, LOGD, FL("dph Station Number = %d"),
sta_cnt + 1);
- lim_log(mac_ctx, LOG1, FL("MAC = " MAC_ADDRESS_STR),
+ lim_log(mac_ctx, LOGD, FL("MAC = " MAC_ADDRESS_STR),
MAC_ADDR_ARRAY(sta_ds->staAddr));
- lim_log(mac_ctx, LOG1, FL("Association Id = %d"),
+ lim_log(mac_ctx, LOGD, FL("Association Id = %d"),
sta_ds->assocId);
- lim_log(mac_ctx, LOG1, FL("Station Index = %d"),
+ lim_log(mac_ctx, LOGD, FL("Station Index = %d"),
sta_ds->staIndex);
assoc_sta_tmp++;
sta_cnt++;
@@ -3347,7 +3347,7 @@ __lim_handle_sme_stop_bss_request(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
stopBssReq.bssid.bytes,
&sessionId);
if (psessionEntry == NULL) {
- lim_log(pMac, LOGW,
+ lim_log(pMac, LOGE,
FL("session does not exist for given BSSID "));
lim_send_sme_rsp(pMac, eWNI_SME_STOP_BSS_RSP,
eSIR_SME_INVALID_PARAMETERS, smesessionId,
@@ -3382,7 +3382,7 @@ __lim_handle_sme_stop_bss_request(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
if (LIM_IS_AP_ROLE(psessionEntry))
lim_wpspbc_close(pMac, psessionEntry);
- lim_log(pMac, LOGW,
+ lim_log(pMac, LOGD,
FL("RECEIVED STOP_BSS_REQ with reason code=%d"),
stopBssReq.reasonCode);
@@ -3450,10 +3450,8 @@ __lim_handle_sme_stop_bss_request(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
status = lim_del_bss(pMac, NULL, psessionEntry->bssIdx, psessionEntry);
if (status != eSIR_SUCCESS) {
- PELOGE(lim_log
- (pMac, LOGE, FL("delBss failed for bss %d"),
+ lim_log(pMac, LOGE, FL("delBss failed for bss %d"),
psessionEntry->bssIdx);
- )
psessionEntry->limSmeState = prevState;
MTRACE(mac_trace
@@ -3566,7 +3564,7 @@ void __lim_process_sme_assoc_cnf_new(tpAniSirGlobal mac_ctx, uint32_t msg_type,
lim_log(mac_ctx, LOGE, FL(
"Rcvd invalid msg %X due to no STA ctx, aid %d, peer "),
msg_type, assoc_cnf.aid);
- lim_print_mac_addr(mac_ctx, assoc_cnf.peer_macaddr.bytes, LOG1);
+ lim_print_mac_addr(mac_ctx, assoc_cnf.peer_macaddr.bytes, LOGE);
/*
* send a DISASSOC_IND message to WSM to make sure
@@ -3583,10 +3581,10 @@ void __lim_process_sme_assoc_cnf_new(tpAniSirGlobal mac_ctx, uint32_t msg_type,
if (qdf_mem_cmp((uint8_t *)sta_ds->staAddr,
(uint8_t *) assoc_cnf.peer_macaddr.bytes,
QDF_MAC_ADDR_SIZE)) {
- lim_log(mac_ctx, LOG1, FL(
+ lim_log(mac_ctx, LOGD, FL(
"peerMacAddr mismatched for aid %d, peer "),
assoc_cnf.aid);
- lim_print_mac_addr(mac_ctx, assoc_cnf.peer_macaddr.bytes, LOG1);
+ lim_print_mac_addr(mac_ctx, assoc_cnf.peer_macaddr.bytes, LOGD);
goto end;
}
@@ -3595,18 +3593,18 @@ void __lim_process_sme_assoc_cnf_new(tpAniSirGlobal mac_ctx, uint32_t msg_type,
(msg_type != eWNI_SME_ASSOC_CNF)) ||
((sta_ds->mlmStaContext.subType == LIM_REASSOC) &&
(msg_type != eWNI_SME_ASSOC_CNF))) {
- lim_log(mac_ctx, LOG1, FL(
+ lim_log(mac_ctx, LOGD, FL(
"not in MLM_WT_ASSOC_CNF_STATE, for aid %d, peer"
"StaD mlmState : %d"),
assoc_cnf.aid, sta_ds->mlmStaContext.mlmState);
- lim_print_mac_addr(mac_ctx, assoc_cnf.peer_macaddr.bytes, LOG1);
+ lim_print_mac_addr(mac_ctx, assoc_cnf.peer_macaddr.bytes, LOGD);
goto end;
}
/*
* Deactivate/delet CNF_WAIT timer since ASSOC_CNF
* has been received
*/
- lim_log(mac_ctx, LOG1, FL("Received SME_ASSOC_CNF. Delete Timer"));
+ lim_log(mac_ctx, LOGD, FL("Received SME_ASSOC_CNF. Delete Timer"));
lim_deactivate_and_change_per_sta_id_timer(mac_ctx,
eLIM_CNF_WAIT_TIMER, sta_ds->assocId);
@@ -3618,7 +3616,7 @@ void __lim_process_sme_assoc_cnf_new(tpAniSirGlobal mac_ctx, uint32_t msg_type,
*/
sta_ds->mlmStaContext.mlmState =
eLIM_MLM_LINK_ESTABLISHED_STATE;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("sending Assoc Rsp frame to STA (assoc id=%d) "),
sta_ds->assocId);
lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_SUCCESS,
@@ -3635,7 +3633,7 @@ void __lim_process_sme_assoc_cnf_new(tpAniSirGlobal mac_ctx, uint32_t msg_type,
*/
if (!sta_ds->mlmStaContext.updateContext)
sta_ds->mlmStaContext.updateContext = 1;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Recv Assoc Cnf, status Code : %d(assoc id=%d) "),
assoc_cnf.statusCode, sta_ds->assocId);
lim_reject_association(mac_ctx, sta_ds->staAddr,
@@ -3697,14 +3695,13 @@ static void __lim_process_sme_addts_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
* - wait for addts response from ap
* if ap, just ignore with error log
*/
- PELOG1(lim_log(pMac, LOG1,
- FL("Received SME_ADDTS_REQ (TSid %d, UP %d)"),
- pSirAddts->req.tspec.tsinfo.traffic.tsid,
- pSirAddts->req.tspec.tsinfo.traffic.userPrio);
- )
+ lim_log(pMac, LOGD,
+ FL("Received SME_ADDTS_REQ (TSid %d, UP %d)"),
+ pSirAddts->req.tspec.tsinfo.traffic.tsid,
+ pSirAddts->req.tspec.tsinfo.traffic.userPrio);
if (!LIM_IS_STA_ROLE(psessionEntry)) {
- PELOGE(lim_log(pMac, LOGE, "AddTs received on AP - ignoring");)
+ lim_log(pMac, LOGE, "AddTs received on AP - ignoring");
lim_send_sme_addts_rsp(pMac, pSirAddts->rspReqd, eSIR_FAILURE,
psessionEntry, pSirAddts->req.tspec,
smesessionId, smetransactionId);
@@ -3716,9 +3713,7 @@ static void __lim_process_sme_addts_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
&psessionEntry->dph.dphHashTable);
if (pStaDs == NULL) {
- PELOGE(lim_log
- (pMac, LOGE, "Cannot find AP context for addts req");
- )
+ lim_log(pMac, LOGE, "Cannot find AP context for addts req");
lim_send_sme_addts_rsp(pMac, pSirAddts->rspReqd, eSIR_FAILURE,
psessionEntry, pSirAddts->req.tspec,
smesessionId, smetransactionId);
@@ -3747,9 +3742,7 @@ static void __lim_process_sme_addts_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
else if (pStaDs->lleEnabled)
pSirAddts->req.lleTspecPresent = 1;
else {
- PELOGW(lim_log
- (pMac, LOGW, FL("ADDTS_REQ ignore - qos is disabled"));
- )
+ lim_log(pMac, LOGW, FL("ADDTS_REQ ignore - qos is disabled"));
lim_send_sme_addts_rsp(pMac, pSirAddts->rspReqd, eSIR_FAILURE,
psessionEntry, pSirAddts->req.tspec,
smesessionId, smetransactionId);
@@ -3790,13 +3783,13 @@ static void __lim_process_sme_addts_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
/* ship out the message now */
lim_send_addts_req_action_frame(pMac, peerMac, &pSirAddts->req,
psessionEntry);
- PELOG1(lim_log(pMac, LOG1, "Sent ADDTS request");)
+ lim_log(pMac, LOGD, "Sent ADDTS request");
/* start a timer to wait for the response */
if (pSirAddts->timeout)
timeout = pSirAddts->timeout;
else if (wlan_cfg_get_int(pMac, WNI_CFG_ADDTS_RSP_TIMEOUT, &timeout) !=
eSIR_SUCCESS) {
- lim_log(pMac, LOGP,
+ lim_log(pMac, LOGE,
FL("Unable to get Cfg param %d (Addts Rsp Timeout)"),
WNI_CFG_ADDTS_RSP_TIMEOUT);
return;
@@ -3805,14 +3798,14 @@ static void __lim_process_sme_addts_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
timeout = SYS_MS_TO_TICKS(timeout);
if (tx_timer_change(&pMac->lim.limTimers.gLimAddtsRspTimer, timeout, 0)
!= TX_SUCCESS) {
- lim_log(pMac, LOGP, FL("AddtsRsp timer change failed!"));
+ lim_log(pMac, LOGE, FL("AddtsRsp timer change failed!"));
return;
}
pMac->lim.gLimAddtsRspTimerCount++;
if (tx_timer_change_context(&pMac->lim.limTimers.gLimAddtsRspTimer,
pMac->lim.gLimAddtsRspTimerCount) !=
TX_SUCCESS) {
- lim_log(pMac, LOGP, FL("AddtsRsp timer change failed!"));
+ lim_log(pMac, LOGE, FL("AddtsRsp timer change failed!"));
return;
}
MTRACE(mac_trace
@@ -3823,7 +3816,7 @@ static void __lim_process_sme_addts_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
pMac->lim.limTimers.gLimAddtsRspTimer.sessionId = sessionId;
if (tx_timer_activate(&pMac->lim.limTimers.gLimAddtsRspTimer) !=
TX_SUCCESS) {
- lim_log(pMac, LOGP, FL("AddtsRsp timer activation failed!"));
+ lim_log(pMac, LOGE, FL("AddtsRsp timer activation failed!"));
return;
}
return;
@@ -3860,14 +3853,14 @@ static void __lim_process_sme_delts_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
if (eSIR_SUCCESS !=
lim_validate_delts_req(pMac, pDeltsReq, peerMacAddr, psessionEntry)) {
- PELOGE(lim_log(pMac, LOGE, FL("lim_validate_delts_req failed"));)
+ lim_log(pMac, LOGE, FL("lim_validate_delts_req failed"));
status = eSIR_FAILURE;
lim_send_sme_delts_rsp(pMac, pDeltsReq, eSIR_FAILURE, psessionEntry,
smesessionId, smetransactionId);
return;
}
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("Sent DELTS request to station with assocId = %d MacAddr = "
MAC_ADDRESS_STR),
pDeltsReq->aid, MAC_ADDR_ARRAY(peerMacAddr));
@@ -4049,7 +4042,7 @@ __lim_process_sme_update_apwpsi_es(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
tpPESession psessionEntry;
uint8_t sessionId; /* PE sessionID */
- PELOG1(lim_log(pMac, LOG1, FL("received UPDATE_APWPSIEs_REQ message")););
+ lim_log(pMac, LOGD, FL("received UPDATE_APWPSIEs_REQ message"));
if (pMsgBuf == NULL) {
lim_log(pMac, LOGE, FL("Buffer is Pointing to NULL"));
@@ -4095,20 +4088,16 @@ lim_send_vdev_restart(tpAniSirGlobal pMac,
tSirRetStatus retCode = eSIR_SUCCESS;
if (psessionEntry == NULL) {
- PELOGE(lim_log
- (pMac, LOGE, "%s:%d: Invalid parameters", __func__,
- __LINE__);
- )
+ lim_log(pMac, LOGE, "%s:%d: Invalid parameters", __func__,
+ __LINE__);
return;
}
pHalHiddenSsidVdevRestart =
qdf_mem_malloc(sizeof(tHalHiddenSsidVdevRestart));
if (NULL == pHalHiddenSsidVdevRestart) {
- PELOGE(lim_log
- (pMac, LOGE, "%s:%d: Unable to allocate memory",
+ lim_log(pMac, LOGE, "%s:%d: Unable to allocate memory",
__func__, __LINE__);
- )
return;
}
@@ -4121,10 +4110,8 @@ lim_send_vdev_restart(tpAniSirGlobal pMac,
retCode = wma_post_ctrl_msg(pMac, &msgQ);
if (eSIR_SUCCESS != retCode) {
- PELOGE(lim_log
- (pMac, LOGE, "%s:%d: wma_post_ctrl_msg() failed", __func__,
- __LINE__);
- )
+ lim_log(pMac, LOGE, "%s:%d: wma_post_ctrl_msg() failed",
+ __func__, __LINE__);
qdf_mem_free(pHalHiddenSsidVdevRestart);
}
}
@@ -4194,13 +4181,12 @@ static void __lim_process_roam_scan_offload_req(tpAniSirGlobal mac_ctx,
static void lim_handle_update_ssid_hidden(tpAniSirGlobal mac_ctx,
tpPESession session, uint8_t ssid_hidden)
{
- lim_log(mac_ctx, LOG1, FL("received HIDE_SSID message"));
+ lim_log(mac_ctx, LOGD,
+ FL("received HIDE_SSID message old HIDE_SSID: %d new HIDE_SSID: %d"),
+ session->ssidHidden, ssid_hidden);
+
if (ssid_hidden != session->ssidHidden)
session->ssidHidden = ssid_hidden;
- else {
- lim_log(mac_ctx, LOG1, FL("Same config already present!"));
- return;
- }
/* Send vdev restart */
lim_send_vdev_restart(mac_ctx, session, session->smeSessionId);
@@ -4241,7 +4227,7 @@ static void __lim_process_sme_session_update(tpAniSirGlobal mac_ctx,
return;
}
- lim_log(mac_ctx, LOG1, FL("received SME Session update for %d val %d"),
+ lim_log(mac_ctx, LOGD, FL("received SME Session update for %d val %d"),
msg->param_type, msg->param_val);
switch (msg->param_type) {
case SIR_PARAM_SSID_HIDDEN:
@@ -4315,9 +4301,8 @@ static void __lim_process_sme_change_bi(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
uint8_t sessionId = 0;
tUpdateBeaconParams beaconParams;
- PELOG1(lim_log(pMac, LOG1,
- FL("received Update Beacon Interval message"));
- );
+ lim_log(pMac, LOGD,
+ FL("received Update Beacon Interval message"));
if (pMsgBuf == NULL) {
lim_log(pMac, LOGE, FL("Buffer is Pointing to NULL"));
@@ -4349,11 +4334,9 @@ static void __lim_process_sme_change_bi(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
pMac->sch.schObject.gSchBeaconInterval =
pChangeBIParams->beaconInterval;
- PELOG1(lim_log(pMac, LOG1,
- FL
- ("LIM send update BeaconInterval Indication : %d"),
- pChangeBIParams->beaconInterval);
- );
+ lim_log(pMac, LOGD,
+ FL("LIM send update BeaconInterval Indication : %d"),
+ pChangeBIParams->beaconInterval);
if (false == pMac->sap.SapDfsInfo.is_dfs_cac_timer_running) {
/* Update beacon */
@@ -4384,7 +4367,7 @@ static void __lim_process_sme_set_ht2040_mode(tpAniSirGlobal pMac,
uint16_t staId = 0;
tpDphHashNode pStaDs = NULL;
- PELOG1(lim_log(pMac, LOG1, FL("received Set HT 20/40 mode message")););
+ lim_log(pMac, LOGD, FL("received Set HT 20/40 mode message"));
if (pMsgBuf == NULL) {
lim_log(pMac, LOGE, FL("Buffer is Pointing to NULL"));
return;
@@ -4396,13 +4379,13 @@ static void __lim_process_sme_set_ht2040_mode(tpAniSirGlobal pMac,
pSetHT2040Mode->bssid.bytes,
&sessionId);
if (psessionEntry == NULL) {
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("Session does not exist for given BSSID "));
- lim_print_mac_addr(pMac, pSetHT2040Mode->bssid.bytes, LOG1);
+ lim_print_mac_addr(pMac, pSetHT2040Mode->bssid.bytes, LOGD);
return;
}
- lim_log(pMac, LOG1, FL("Update session entry for cbMod=%d"),
+ lim_log(pMac, LOGD, FL("Update session entry for cbMod=%d"),
pSetHT2040Mode->cbMode);
/*Update sessionEntry HT related fields */
switch (pSetHT2040Mode->cbMode) {
@@ -4474,13 +4457,13 @@ static void __lim_process_sme_set_ht2040_mode(tpAniSirGlobal pMac,
qdf_mem_free(pHtOpMode);
return;
}
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL
("%s: Notifed FW about OP mode: %d for staId=%d"),
__func__, pHtOpMode->opMode, staId);
} else
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("%s: station %d does not support HT40\n"),
__func__, staId);
}
@@ -4565,7 +4548,7 @@ lim_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower,
msgQ.type = WMA_SET_MAX_TX_POWER_REQ;
msgQ.bodyptr = pMaxTxParams;
msgQ.bodyval = 0;
- lim_log(pMac, LOG1, FL("Post WMA_SET_MAX_TX_POWER_REQ to WMA"));
+ lim_log(pMac, LOGD, FL("Post WMA_SET_MAX_TX_POWER_REQ to WMA"));
MTRACE(mac_trace_msg_tx(pMac, pSessionEntry->peSessionId, msgQ.type));
retCode = wma_post_ctrl_msg(pMac, &msgQ);
if (eSIR_SUCCESS != retCode) {
@@ -4595,7 +4578,7 @@ static void __lim_process_sme_register_mgmt_frame_req(tpAniSirGlobal mac_ctx,
struct mgmt_frm_reg_info *next = NULL;
bool match = false;
- lim_log(mac_ctx, LOG1, FL(
+ lim_log(mac_ctx, LOGD, FL(
"registerFrame %d, frameType %d, matchLen %d"),
sme_req->registerFrame, sme_req->frameType,
sme_req->matchLen);
@@ -4669,7 +4652,7 @@ skip_match:
static void __lim_deregister_deferred_sme_req_after_noa_start(tpAniSirGlobal pMac)
{
- lim_log(pMac, LOG1, FL("Dereg msgType %d"),
+ lim_log(pMac, LOGD, FL("Dereg msgType %d"),
pMac->lim.gDeferMsgTypeForNOA);
pMac->lim.gDeferMsgTypeForNOA = 0;
if (pMac->lim.gpDefdSmeMsgForNOA != NULL) {
@@ -4693,7 +4676,7 @@ void lim_process_regd_defd_sme_req_after_noa_start(tpAniSirGlobal mac_ctx)
{
bool buf_consumed = true;
- lim_log(mac_ctx, LOG1, FL("Process defd sme req %d"),
+ lim_log(mac_ctx, LOGD, FL("Process defd sme req %d"),
mac_ctx->lim.gDeferMsgTypeForNOA);
if ((mac_ctx->lim.gDeferMsgTypeForNOA == 0) ||
@@ -4844,8 +4827,8 @@ static void __lim_process_send_disassoc_frame(tpAniSirGlobal mac_ctx,
if ((eSIR_FAILURE == status) ||
(lim_is_group_addr(sme_send_disassoc_frame_req.peer_mac) &&
!lim_is_addr_bc(sme_send_disassoc_frame_req.peer_mac))) {
- PELOGE(lim_log(mac_ctx, LOGE,
- FL("received invalid SME_DISASSOC_REQ message"));)
+ lim_log(mac_ctx, LOGE,
+ FL("received invalid SME_DISASSOC_REQ message"));
return;
}
@@ -4858,7 +4841,7 @@ static void __lim_process_send_disassoc_frame(tpAniSirGlobal mac_ctx,
return;
}
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("msg_type->%d len->%d sess_id->%d trans_id->%d mac->"MAC_ADDRESS_STR" reason->%d wait_for_ack->%d"),
sme_send_disassoc_frame_req.msg_type,
sme_send_disassoc_frame_req.length,
@@ -5052,7 +5035,7 @@ static void lim_process_set_vdev_ies_per_band(tpAniSirGlobal mac_ctx,
return;
}
- lim_log(mac_ctx, LOG1, FL("rcvd set vdev ie per band req vdev_id = %d"),
+ lim_log(mac_ctx, LOGD, FL("rcvd set vdev ie per band req vdev_id = %d"),
p_msg->vdev_id);
/* intentionally using NULL here so that self capabilty are sent */
if (lim_send_ies_per_band(mac_ctx, NULL, p_msg->vdev_id) !=
@@ -5081,7 +5064,7 @@ static void lim_process_set_pdev_IEs(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
return;
}
- lim_log(mac_ctx, LOG1, FL("rcvd set pdev ht vht ie req with nss = %d"),
+ lim_log(mac_ctx, LOGD, FL("rcvd set pdev ht vht ie req with nss = %d"),
ht_vht_cfg->nss);
lim_set_pdev_ht_ie(mac_ctx, ht_vht_cfg->pdev_id, ht_vht_cfg->nss);
@@ -5168,14 +5151,11 @@ bool lim_process_sme_req_messages(tpAniSirGlobal pMac, tpSirMsgQ pMsg)
bool bufConsumed = true; /* Set this flag to false within case block of any following message, that doesnt want pMsgBuf to be freed. */
uint32_t *pMsgBuf = pMsg->bodyptr;
tpSirSmeScanReq pScanReq;
- PELOG1(lim_log
- (pMac, LOG1,
- FL
- ("LIM Received SME Message %s(%d) Global LimSmeState:%s(%d) Global LimMlmState: %s(%d)"),
+ lim_log(pMac, LOGD,
+ FL("LIM Received SME Message %s(%d) Global LimSmeState:%s(%d) Global LimMlmState: %s(%d)"),
lim_msg_str(pMsg->type), pMsg->type,
lim_sme_state_str(pMac->lim.gLimSmeState), pMac->lim.gLimSmeState,
lim_mlm_state_str(pMac->lim.gLimMlmState), pMac->lim.gLimMlmState);
- )
pScanReq = (tpSirSmeScanReq) pMsgBuf;
/* If no insert NOA required then execute the code below */
@@ -5237,28 +5217,23 @@ bool lim_process_sme_req_messages(tpAniSirGlobal pMac, tpSirMsgQ pMsg)
break;
case eWNI_SME_ASSOC_CNF:
- if (pMsg->type == eWNI_SME_ASSOC_CNF)
- PELOG1(lim_log(pMac,
- LOG1, FL("Received ASSOC_CNF message"));)
- __lim_process_sme_assoc_cnf_new(pMac, pMsg->type,
- pMsgBuf);
+ lim_log(pMac, LOGD, FL("Received ASSOC_CNF message"));
+ __lim_process_sme_assoc_cnf_new(pMac, pMsg->type, pMsgBuf);
break;
case eWNI_SME_ADDTS_REQ:
- PELOG1(lim_log(pMac, LOG1, FL("Received ADDTS_REQ message"));)
+ lim_log(pMac, LOGD, FL("Received ADDTS_REQ message"));
__lim_process_sme_addts_req(pMac, pMsgBuf);
break;
case eWNI_SME_DELTS_REQ:
- PELOG1(lim_log(pMac, LOG1, FL("Received DELTS_REQ message"));)
+ lim_log(pMac, LOGD, FL("Received DELTS_REQ message"));
__lim_process_sme_delts_req(pMac, pMsgBuf);
break;
case SIR_LIM_ADDTS_RSP_TIMEOUT:
- PELOG1(lim_log
- (pMac, LOG1,
- FL("Received SIR_LIM_ADDTS_RSP_TIMEOUT message "));
- )
+ lim_log(pMac, LOGD,
+ FL("Received SIR_LIM_ADDTS_RSP_TIMEOUT message "));
lim_process_sme_addts_rsp_timeout(pMac, pMsg->bodyval);
break;
@@ -5700,9 +5675,9 @@ lim_update_ibss_prop_add_ies(tpAniSirGlobal pMac, uint8_t **pDstData_buff,
oui_length = pModifyIE->oui_length;
if ((0 == oui_length) || (NULL == ibss_ie)) {
- PELOGE(lim_log(pMac, LOGE,
+ lim_log(pMac, LOGE,
FL("Invalid set IBSS vendor IE command length %d "),
- oui_length);)
+ oui_length);
return false;
}
@@ -6141,7 +6116,8 @@ skip_vht:
else
ch_offset = dfs_csa_ie_req->ch_params.sec_ch_offset;
- lim_log(mac_ctx, LOG1, FL("IE count:%d chan:%d width:%d wrapper:%d ch_offset:%d"),
+ lim_log(mac_ctx, LOGD,
+ FL("IE count:%d chan:%d width:%d wrapper:%d ch_offset:%d"),
session_entry->gLimChannelSwitch.switchCount,
session_entry->gLimChannelSwitch.primaryChannel,
session_entry->gLimChannelSwitch.ch_width,
diff --git a/core/mac/src/pe/lim/lim_scan_result_utils.c b/core/mac/src/pe/lim/lim_scan_result_utils.c
index 0f04f7a56202..d5f47c2515f6 100644
--- a/core/mac/src/pe/lim/lim_scan_result_utils.c
+++ b/core/mac/src/pe/lim/lim_scan_result_utils.c
@@ -162,9 +162,9 @@ lim_collect_bss_description(tpAniSirGlobal pMac,
/* Copy RSSI & SINR from BD */
- lim_log(pMac, LOG4, "*********BSS Description for BSSID:********* ");
- sir_dump_buf(pMac, SIR_LIM_MODULE_ID, LOG4, pBssDescr->bssId, 6);
- sir_dump_buf(pMac, SIR_LIM_MODULE_ID, LOG4,
+ lim_log(pMac, LOGD, "*********BSS Description for BSSID:********* ");
+ sir_dump_buf(pMac, SIR_LIM_MODULE_ID, LOGD, pBssDescr->bssId, 6);
+ sir_dump_buf(pMac, SIR_LIM_MODULE_ID, LOGD,
(uint8_t *) pRxPacketInfo, 36);
pBssDescr->rssi = (int8_t) WMA_GET_RX_RSSI_NORMALIZED(pRxPacketInfo);
@@ -172,7 +172,7 @@ lim_collect_bss_description(tpAniSirGlobal pMac,
/* SINR no longer reported by HW */
pBssDescr->sinr = 0;
- lim_log(pMac, LOG3,
+ lim_log(pMac, LOGD,
FL(MAC_ADDRESS_STR " rssi: normalized = %d, absolute = %d"),
MAC_ADDR_ARRAY(pHdr->bssId), pBssDescr->rssi,
pBssDescr->rssi_raw);
@@ -181,13 +181,14 @@ lim_collect_bss_description(tpAniSirGlobal pMac,
pBssDescr->tsf_delta = WMA_GET_RX_TSF_DELTA(pRxPacketInfo);
pBssDescr->seq_ctrl = pHdr->seqControl;
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("BSSID: "MAC_ADDRESS_STR " tsf_delta = %u ReceivedTime = %llu ssid = %s"),
MAC_ADDR_ARRAY(pHdr->bssId), pBssDescr->tsf_delta,
pBssDescr->received_time,
((pBPR->ssidPresent) ? (char *)pBPR->ssId.ssId : ""));
- lim_log(pMac, LOG1, FL("Seq Ctrl: Frag Num: %d, Seq Num: LO:%02x HI:%02x"),
+ lim_log(pMac, LOGD,
+ FL("Seq Ctrl: Frag Num: %d, Seq Num: LO:%02x HI:%02x"),
pBssDescr->seq_ctrl.fragNum, pBssDescr->seq_ctrl.seqNumLo,
pBssDescr->seq_ctrl.seqNumHi);
@@ -225,7 +226,7 @@ lim_collect_bss_description(tpAniSirGlobal pMac,
/*set channel number in beacon in case it is not present */
pBPR->channelNumber = pBssDescr->channelId;
- lim_log(pMac, LOG3,
+ lim_log(pMac, LOGD,
FL("Collected BSS Description for Channel(%1d), length(%u), IE Fields(%u)"),
pBssDescr->channelId, pBssDescr->length, ieLen);
pMac->lim.beacon_probe_rsp_cnt_per_scan++;
@@ -303,7 +304,7 @@ lim_check_and_add_bss_description(tpAniSirGlobal mac_ctx,
if (rx_chan_bd != rx_chan_in_beacon) {
/* BCAST Frame, if CH do not match, Drop */
if (WMA_IS_RX_BCAST(rx_packet_info)) {
- lim_log(mac_ctx, LOG3,
+ lim_log(mac_ctx, LOGD,
FL("Beacon/Probe Rsp dropped. Channel in BD %d. Channel in beacon %d"),
WMA_GET_RX_CH(rx_packet_info),
lim_get_channel_from_beacon(mac_ctx,
@@ -313,7 +314,7 @@ lim_check_and_add_bss_description(tpAniSirGlobal mac_ctx,
/* Unit cast frame, Probe RSP, do not drop */
else {
dont_update_all = 1;
- lim_log(mac_ctx, LOG3,
+ lim_log(mac_ctx, LOGD,
FL("SSID %s, CH in ProbeRsp %d, CH in BD %d, mismatch, Do Not Drop"),
bpr->ssId.ssId, rx_chan_in_beacon,
WMA_GET_RX_CH(rx_packet_info));
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 6e7c8c0ecaee..82d8a2a8315f 100644
--- a/core/mac/src/pe/lim/lim_send_management_frames.c
+++ b/core/mac/src/pe/lim/lim_send_management_frames.c
@@ -118,7 +118,7 @@ void lim_populate_p2p_mac_header(tpAniSirGlobal pMac, uint8_t *pBD)
/* Prepare sequence number */
lim_add_mgmt_seq_num(pMac, pMacHdr);
- lim_log(pMac, LOG1, "seqNumLo=%d, seqNumHi=%d, mgmtSeqNum=%d",
+ lim_log(pMac, LOGD, "seqNumLo=%d, seqNumHi=%d, mgmtSeqNum=%d",
pMacHdr->seqControl.seqNumLo,
pMacHdr->seqControl.seqNumHi, pMac->mgmtSeqNum);
}
@@ -171,7 +171,7 @@ void lim_populate_mac_header(tpAniSirGlobal mac_ctx, uint8_t *buf,
/* Prepare sequence number */
lim_add_mgmt_seq_num(mac_ctx, mac_hdr);
- lim_log(mac_ctx, LOG1, "seqNumLo=%d, seqNumHi=%d, mgmtSeqNum=%d",
+ lim_log(mac_ctx, LOGD, "seqNumLo=%d, seqNumHi=%d, mgmtSeqNum=%d",
mac_hdr->seqControl.seqNumLo,
mac_hdr->seqControl.seqNumHi, mac_ctx->mgmtSeqNum);
}
@@ -356,7 +356,7 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx,
&addn_ielen,
&extracted_ext_cap);
if (eSIR_SUCCESS != sir_status) {
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Unable to Stripoff ExtCap IE from Probe Req"));
} else {
struct s_ext_cap *p_ext_cap =
@@ -677,7 +677,7 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
populate_dot11f_ht_info(mac_ctx, &frm->HTInfo, pe_session);
}
if (pe_session->vhtCapability) {
- lim_log(mac_ctx, LOG1, FL("Populate VHT IE in Probe Response"));
+ lim_log(mac_ctx, LOGD, FL("Populate VHT IE in Probe Response"));
populate_dot11f_vht_caps(mac_ctx, pe_session, &frm->VHTCaps);
populate_dot11f_vht_operation(mac_ctx, pe_session,
&frm->VHTOperation);
@@ -749,7 +749,7 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
add_ie, &addn_ie_len,
&extracted_ext_cap);
if (eSIR_SUCCESS != sir_status) {
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Unable to strip off ExtCap IE"));
} else {
extracted_ext_cap_flag = true;
@@ -1224,7 +1224,7 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
if (sta->mlmStaContext.htCapability &&
pe_session->htCapability) {
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Populate HT IEs in Assoc Response"));
populate_dot11f_ht_caps(mac_ctx, pe_session,
&frm.HTCaps);
@@ -1243,7 +1243,7 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
populate_dot11f_ht_info(mac_ctx, &frm.HTInfo,
pe_session);
}
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("SupportedChnlWidth: %d, mimoPS: %d, GF: %d, short GI20:%d, shortGI40: %d, dsssCck: %d, AMPDU Param: %x"),
frm.HTCaps.supportedChannelWidthSet,
frm.HTCaps.mimoPowerSave,
@@ -1254,7 +1254,7 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
if (sta->mlmStaContext.vhtCapability &&
pe_session->vhtCapability) {
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Populate VHT IEs in Assoc Response"));
populate_dot11f_vht_caps(mac_ctx, pe_session,
&frm.VHTCaps);
@@ -1266,7 +1266,7 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
pe_session->vendor_vht_sap &&
(assoc_req != NULL) &&
assoc_req->vendor_vht_ie.VHTCaps.present) {
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Populate Vendor VHT IEs in Assoc Rsponse"));
frm.vendor_vht_ie.present = 1;
frm.vendor_vht_ie.type =
@@ -1354,7 +1354,7 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
(mac_ctx, &add_ie[0], &stripoff_len,
&extracted_ext_cap);
if (eSIR_SUCCESS != sir_status) {
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("strip off extcap IE failed"));
} else {
addn_ie_len = stripoff_len;
@@ -1362,7 +1362,7 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
}
bytes = bytes + addn_ie_len;
}
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("addn_ie_len = %d for Assoc Resp : %d"),
addn_ie_len, assoc_req->addIEPresent);
}
@@ -1425,16 +1425,11 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
status);
}
- if (subtype == LIM_ASSOC)
- lim_log(mac_ctx, LOG1,
- FL("*** Sending Assoc Resp status %d aid %d to "),
- status_code, aid);
- else
- lim_log(mac_ctx, LOG1,
- FL("*** Sending ReAssoc Resp status %d aid %d to "),
- status_code, aid);
+ lim_log(mac_ctx, LOGD,
+ FL("*** Sending Assoc Resp subtype %d status %d aid %d to "),
+ subtype, status_code, aid);
- lim_print_mac_addr(mac_ctx, mac_hdr->da, LOG1);
+ lim_print_mac_addr(mac_ctx, mac_hdr->da, LOGD);
if (addn_ie_len && addn_ie_len <= WNI_CFG_ASSOC_RSP_ADDNIE_DATA_LEN)
qdf_mem_copy(frame + sizeof(tSirMacMgmtHdr) + payload,
@@ -1597,10 +1592,8 @@ lim_send_delts_req_action_frame(tpAniSirGlobal pMac,
}
}
- PELOG1(lim_log
- (pMac, LOG1, FL("Sending DELTS REQ (size %d) to "), nBytes);
- lim_print_mac_addr(pMac, pMacHdr->da, LOG1);
- )
+ lim_log(pMac, LOGD, FL("Sending DELTS REQ (size %d) to "), nBytes);
+ lim_print_mac_addr(pMac, pMacHdr->da, LOGD);
if ((SIR_BAND_5_GHZ ==
lim_get_rf_band(psessionEntry->currentOperChannel))
@@ -1641,7 +1634,7 @@ static QDF_STATUS lim_assoc_tx_complete_cnf(tpAniSirGlobal mac_ctx,
uint16_t assoc_ack_status;
uint16_t reason_code;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("tx_complete= %d"), tx_complete);
if (tx_complete) {
assoc_ack_status = ACKED;
@@ -1726,7 +1719,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
add_ie, &add_ie_len, &extr_ext_cap);
if (eSIR_SUCCESS != sir_status) {
extr_ext_flag = false;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Unable to Stripoff ExtCap IE from Assoc Req"));
} else {
struct s_ext_cap *p_ext_cap = (struct s_ext_cap *)
@@ -1739,7 +1732,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
extr_ext_flag = (extr_ext_cap.num_bytes > 0);
}
} else {
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("No addn IE or peer dosen't support addnIE for Assoc Req"));
extr_ext_flag = false;
}
@@ -1857,12 +1850,12 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
*/
if (pe_session->htCapability &&
mac_ctx->lim.htCapabilityPresentInBeacon) {
- lim_log(mac_ctx, LOG1, FL("Populate HT Caps in Assoc Request"));
+ lim_log(mac_ctx, LOGD, FL("Populate HT Caps in Assoc Request"));
populate_dot11f_ht_caps(mac_ctx, pe_session, &frm->HTCaps);
QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
&frm->HTCaps, sizeof(frm->HTCaps));
}
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("SupportedChnlWidth: %d, mimoPS: %d, GF: %d, short GI20:%d, shortGI40: %d, dsssCck: %d, AMPDU Param: %x"),
frm->HTCaps.supportedChannelWidthSet,
frm->HTCaps.mimoPowerSave,
@@ -1873,7 +1866,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
if (pe_session->vhtCapability &&
pe_session->vhtCapabilityPresentInBeacon) {
- lim_log(mac_ctx, LOG1, FL("Populate VHT IEs in Assoc Request"));
+ lim_log(mac_ctx, LOGD, FL("Populate VHT IEs in Assoc Request"));
populate_dot11f_vht_caps(mac_ctx, pe_session, &frm->VHTCaps);
QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
&frm->VHTCaps, sizeof(frm->VHTCaps));
@@ -1888,7 +1881,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
}
if (!vht_enabled &&
pe_session->is_vendor_specific_vhtcaps) {
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Populate Vendor VHT IEs in Assoc Request"));
frm->vendor_vht_ie.present = 1;
frm->vendor_vht_ie.type =
@@ -1913,7 +1906,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
tSirBssDescription *bssdescr;
bssdescr = &pe_session->pLimJoinReq->bssDescription;
- lim_log(mac_ctx, LOG1, FL("mdie = %02x %02x %02x"),
+ lim_log(mac_ctx, LOGD, FL("mdie = %02x %02x %02x"),
(unsigned int) bssdescr->mdie[0],
(unsigned int) bssdescr->mdie[1],
(unsigned int) bssdescr->mdie[2]);
@@ -1921,7 +1914,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
pe_session->pLimJoinReq->bssDescription.mdie);
} else {
/* No 11r IEs dont send any MDIE */
- lim_log(mac_ctx, LOG1, FL("MDIE not present"));
+ lim_log(mac_ctx, LOGD, FL("MDIE not present"));
}
#ifdef FEATURE_WLAN_ESE
@@ -1975,7 +1968,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
if (eSIR_SUCCESS != lim_strip_supp_op_class_update_struct(mac_ctx,
add_ie, &add_ie_len, &frm->SuppOperatingClasses))
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Unable to Stripoff supp op classes IE from Assoc Req"));
status = dot11f_get_packed_assoc_request_size(mac_ctx, frm, &payload);
@@ -2038,7 +2031,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
FL("Assoc request pack warning (0x%08x)"), status);
}
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("*** Sending Association Request length %d to "), bytes);
if (pe_session->assocReq != NULL) {
qdf_mem_free(pe_session->assocReq);
@@ -2126,7 +2119,7 @@ static QDF_STATUS lim_auth_tx_complete_cnf(tpAniSirGlobal mac_ctx,
uint16_t auth_ack_status;
uint16_t reason_code;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("tx_complete= %d"), tx_complete);
if (tx_complete) {
mac_ctx->auth_ack_status = LIM_AUTH_ACK_RCD_SUCCESS;
@@ -2338,7 +2331,7 @@ alloc_packet:
if (wep_bit == LIM_WEP_IN_FC) {
qdf_mem_copy(body, (uint8_t *) auth_frame, body_len);
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Sending Auth seq# 3 to " MAC_ADDRESS_STR),
MAC_ADDR_ARRAY(mac_hdr->da));
@@ -2393,7 +2386,7 @@ alloc_packet:
}
}
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("*** Sending Auth seq# %d status %d (%d) to "
MAC_ADDRESS_STR),
auth_frame->authTransactionSeqNumber,
@@ -2589,7 +2582,7 @@ QDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx)
if (LIM_IS_STA_ROLE(pe_session) &&
(disassoc_req->reasonCode !=
eSIR_MAC_DISASSOC_DUE_TO_FTHANDOFF_REASON)) {
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("FT Preauth Session (%p,%d) Clean up"
#ifdef FEATURE_WLAN_ESE
" isESE %d"
@@ -2638,7 +2631,7 @@ end:
QDF_STATUS lim_disassoc_tx_complete_cnf(tpAniSirGlobal pMac,
uint32_t txCompleteSuccess)
{
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("txCompleteSuccess: %d"), txCompleteSuccess);
return lim_send_disassoc_cnf(pMac);
}
@@ -2646,7 +2639,7 @@ QDF_STATUS lim_disassoc_tx_complete_cnf(tpAniSirGlobal pMac,
QDF_STATUS lim_deauth_tx_complete_cnf(tpAniSirGlobal pMac,
uint32_t txCompleteSuccess)
{
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("txCompleteSuccess: %d"), txCompleteSuccess);
return lim_send_deauth_cnf(pMac);
}
@@ -3614,7 +3607,7 @@ lim_send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx,
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Send Ext channel Switch to :"MAC_ADDRESS_STR" with swcount %d, swmode %d , newchannel %d newops %d"),
MAC_ADDR_ARRAY(mac_hdr->da),
frm.ext_chan_switch_ann_action.switch_count,
@@ -3657,7 +3650,7 @@ static QDF_STATUS lim_oper_chan_change_confirm_tx_complete_cnf(
tpAniSirGlobal mac_ctx,
uint32_t tx_complete)
{
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL(" tx_complete= %d"), tx_complete);
return QDF_STATUS_SUCCESS;
}
@@ -3704,12 +3697,13 @@ lim_p2p_oper_chan_change_confirm_action_frame(tpAniSirGlobal mac_ctx,
frm.DialogToken.token = 0x0;
if (session_entry->htCapability) {
- lim_log(mac_ctx, LOG1, FL("Populate HT Caps in Assoc Request"));
+ lim_log(mac_ctx, LOGD, FL("Populate HT Caps in Assoc Request"));
populate_dot11f_ht_caps(mac_ctx, session_entry, &frm.HTCaps);
}
if (session_entry->vhtCapability) {
- lim_log(mac_ctx, LOG1, FL("Populate VHT Caps in Assoc Request"));
+ lim_log(mac_ctx, LOGD,
+ FL("Populate VHT Caps in Assoc Request"));
populate_dot11f_vht_caps(mac_ctx, session_entry, &frm.VHTCaps);
populate_dot11f_operating_mode(mac_ctx,
&frm.OperatingMode, session_entry);
@@ -4270,7 +4264,7 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac,
return eSIR_FAILURE;
}
- lim_log(pMac, LOG1, FL("dialog_token %d num_report %d"),
+ lim_log(pMac, LOGD, FL("dialog_token %d num_report %d"),
dialog_token, num_report);
frm->Category.category = SIR_MAC_ACTION_RRM;
@@ -4515,10 +4509,10 @@ tSirRetStatus lim_send_sa_query_request_frame(tpAniSirGlobal pMac, uint8_t *tran
nStatus);
}
- lim_log(pMac, LOG1, FL("Sending an SA Query Request to "));
- lim_print_mac_addr(pMac, peer, LOG1);
- lim_log(pMac, LOG1, FL("Sending an SA Query Request from "));
- lim_print_mac_addr(pMac, psessionEntry->selfMacAddr, LOG1);
+ lim_log(pMac, LOGD, FL("Sending an SA Query Request to "));
+ lim_print_mac_addr(pMac, peer, LOGD);
+ lim_log(pMac, LOGD, FL("Sending an SA Query Request from "));
+ lim_print_mac_addr(pMac, psessionEntry->selfMacAddr, LOGD);
if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel))
#ifdef WLAN_FEATURE_P2P
@@ -4657,7 +4651,7 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac,
nStatus);
}
- lim_log(pMac, LOG1, FL("Sending a SA Query Response to "));
+ lim_log(pMac, LOGD, FL("Sending a SA Query Response to "));
lim_print_mac_addr(pMac, peer, LOGW);
if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel))
diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
index 40983a447ccf..8626550d497b 100644
--- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -87,7 +87,7 @@ lim_send_sme_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type,
tSirMsgQ msg;
tSirSmeRsp *sme_rsp;
- lim_log(mac_ctx, LOG1, FL("Sending message %s with reasonCode %s"),
+ lim_log(mac_ctx, LOGD, FL("Sending message %s with reasonCode %s"),
lim_msg_str(msg_type), lim_result_code_str(result_code));
sme_rsp = qdf_mem_malloc(sizeof(tSirSmeRsp));
@@ -145,7 +145,7 @@ lim_send_sme_roc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type,
tSirMsgQ msg;
struct sir_roc_rsp *sme_rsp;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Sending message %s with reasonCode %s scanId %d"),
lim_msg_str(msg_type), lim_result_code_str(result_code),
scan_id);
@@ -275,7 +275,7 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx,
qdf_mem_free(session_entry->beacon);
session_entry->beacon = NULL;
session_entry->bcnLen = 0;
- lim_log(mac_ctx, LOG1, FL("Beacon=%d"),
+ lim_log(mac_ctx, LOGD, FL("Beacon=%d"),
sme_join_rsp->beaconLength);
}
if (session_entry->assocReq != NULL) {
@@ -289,7 +289,7 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx,
session_entry->assocReq = NULL;
session_entry->assocReqLen = 0;
lim_log(mac_ctx,
- LOG1, FL("AssocReq=%d"),
+ LOGD, FL("AssocReq=%d"),
sme_join_rsp->assocReqLength);
}
if (session_entry->assocRsp != NULL) {
@@ -316,7 +316,7 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx,
qdf_mem_free(session_entry->ricData);
session_entry->ricData = NULL;
session_entry->RICDataLen = 0;
- lim_log(mac_ctx, LOG1, FL("RicLength=%d"),
+ lim_log(mac_ctx, LOGD, FL("RicLength=%d"),
sme_join_rsp->parsedRicRspLen);
}
#ifdef FEATURE_WLAN_ESE
@@ -333,12 +333,12 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx,
qdf_mem_free(session_entry->tspecIes);
session_entry->tspecIes = NULL;
session_entry->tspecLen = 0;
- lim_log(mac_ctx, LOG1, FL("ESE-TspecLen=%d"),
+ lim_log(mac_ctx, LOGD, FL("ESE-TspecLen=%d"),
sme_join_rsp->tspecIeLen);
}
#endif
sme_join_rsp->aid = session_entry->limAID;
- lim_log(mac_ctx, LOG1, FL("AssocRsp=%d"),
+ lim_log(mac_ctx, LOGD, FL("AssocRsp=%d"),
sme_join_rsp->assocRspLength);
sme_join_rsp->vht_channel_width =
session_entry->ch_width;
@@ -450,7 +450,7 @@ lim_send_sme_join_reassoc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type,
session_entry, (uint16_t) result_code, 0);
#endif /* FEATURE_WLAN_DIAG_SUPPORT */
- lim_log(mac_ctx, LOG1, FL("Sending message %s with reasonCode %s"),
+ lim_log(mac_ctx, LOGD, FL("Sending message %s with reasonCode %s"),
lim_msg_str(msg_type), lim_result_code_str(result_code));
if (session_entry == NULL) {
@@ -520,7 +520,7 @@ lim_send_sme_join_reassoc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type,
/* Send supported NSS 1x1 to SME */
sme_join_rsp->supported_nss_1x1 =
session_entry->supported_nss_1x1;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("SME Join Rsp is supported NSS 1X1: %d"),
sme_join_rsp->supported_nss_1x1);
}
@@ -575,9 +575,8 @@ lim_send_sme_start_bss_rsp(tpAniSirGlobal pMac,
uint16_t ieLen;
uint16_t ieOffset, curLen;
- PELOG1(lim_log(pMac, LOG1, FL("Sending message %s with reasonCode %s"),
+ lim_log(pMac, LOGD, FL("Sending message %s with reasonCode %s"),
lim_msg_str(msgType), lim_result_code_str(resultCode));
- )
size = sizeof(tSirSmeStartBssRsp);
@@ -755,7 +754,7 @@ lim_post_sme_scan_rsp_message(tpAniSirGlobal pMac,
tpSirSmeScanRsp pSirSmeScanRsp;
tSirMsgQ mmhMsg;
- lim_log(pMac, LOG1, FL("send SME_SCAN_RSP (reasonCode %s)."),
+ lim_log(pMac, LOGD, FL("send SME_SCAN_RSP (reasonCode %s)."),
lim_result_code_str(resultCode));
pSirSmeScanRsp = qdf_mem_malloc(sizeof(tSirSmeScanRsp));
@@ -851,7 +850,7 @@ lim_send_sme_disassoc_ntf(tpAniSirGlobal pMac,
tpDphHashNode sta_ds = NULL;
struct sir_sme_discon_done_ind *sir_sme_dis_ind;
- lim_log(pMac, LOG1, FL("Disassoc Ntf with trigger : %d reasonCode: %d"),
+ lim_log(pMac, LOGD, FL("Disassoc Ntf with trigger : %d reasonCode: %d"),
disassocTrigger, reasonCode);
switch (disassocTrigger) {
@@ -860,7 +859,7 @@ lim_send_sme_disassoc_ntf(tpAniSirGlobal pMac,
* Duplicate entry is removed at LIM.
* Initiate new entry for other session
*/
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("Rcvd eLIM_DUPLICATE_ENTRY for " MAC_ADDRESS_STR),
MAC_ADDR_ARRAY(peerMacAddr));
@@ -903,7 +902,7 @@ lim_send_sme_disassoc_ntf(tpAniSirGlobal pMac,
failure = true;
goto error;
}
- lim_log(pMac, LOG1, FL("send eWNI_SME_DISASSOC_RSP with "
+ lim_log(pMac, LOGD, FL("send eWNI_SME_DISASSOC_RSP with "
"retCode: %d for " MAC_ADDRESS_STR),
reasonCode, MAC_ADDR_ARRAY(peerMacAddr));
pSirSmeDisassocRsp->messageType = eWNI_SME_DISASSOC_RSP;
@@ -946,7 +945,7 @@ lim_send_sme_disassoc_ntf(tpAniSirGlobal pMac,
return;
}
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("send eWNI_SME_DISCONNECT_DONE_IND with retCode: %d"),
reasonCode);
@@ -985,7 +984,7 @@ lim_send_sme_disassoc_ntf(tpAniSirGlobal pMac,
failure = true;
goto error;
}
- lim_log(pMac, LOG1, FL("send eWNI_SME_DISASSOC_IND with "
+ lim_log(pMac, LOGD, FL("send eWNI_SME_DISASSOC_IND with "
"retCode: %d for " MAC_ADDRESS_STR),
reasonCode, MAC_ADDR_ARRAY(peerMacAddr));
pSirSmeDisassocInd->messageType = eWNI_SME_DISASSOC_IND;
@@ -1181,7 +1180,7 @@ lim_send_sme_tdls_del_sta_ind(tpAniSirGlobal pMac, tpDphHashNode pStaDs,
("AllocateMemory failed for eWNI_SME_TDLS_DEL_STA_IND "));
return;
}
- lim_log(pMac, LOG1, FL("Delete TDLS Peer "MAC_ADDRESS_STR
+ lim_log(pMac, LOGD, FL("Delete TDLS Peer "MAC_ADDRESS_STR
"with reason code %d"),
MAC_ADDR_ARRAY(pStaDs->staAddr), reasonCode);
/* messageType */
@@ -1393,7 +1392,7 @@ lim_send_sme_deauth_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr,
return;
}
- lim_log(pMac, LOG1, FL("send eWNI_SME_DEAUTH_RSP with "
+ lim_log(pMac, LOGD, FL("send eWNI_SME_DEAUTH_RSP with "
"retCode: %d for" MAC_ADDRESS_STR),
reasonCode, MAC_ADDR_ARRAY(peerMacAddr));
pSirSmeDeauthRsp->messageType = eWNI_SME_DEAUTH_RSP;
@@ -1423,7 +1422,7 @@ lim_send_sme_deauth_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr,
return;
}
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("send eWNI_SME_DISCONNECT_DONE_IND withretCode: %d"),
reasonCode);
@@ -1464,7 +1463,7 @@ lim_send_sme_deauth_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr,
return;
}
- lim_log(pMac, LOG1, FL("send eWNI_SME_DEAUTH_IND with "
+ lim_log(pMac, LOGD, FL("send eWNI_SME_DEAUTH_IND with "
"retCode: %d for " MAC_ADDRESS_STR),
reasonCode, MAC_ADDR_ARRAY(peerMacAddr));
pSirSmeDeauthInd->messageType = eWNI_SME_DEAUTH_IND;
@@ -2106,7 +2105,7 @@ static void lim_process_csa_wbw_ie(tpAniSirGlobal mac_ctx,
chnl_switch_info->newChanWidth = ap_new_ch_width;
}
prnt_log:
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("new channel: %d new_ch_width:%d seg0:%d seg1:%d"),
csa_params->channel,
chnl_switch_info->newChanWidth,
@@ -2136,7 +2135,7 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
tLimWiderBWChannelSwitchInfo *chnl_switch_info = NULL;
tLimChannelSwitchInfo *lim_ch_switch = NULL;
- lim_log(mac_ctx, LOG1, FL("handle csa offload msg"));
+ lim_log(mac_ctx, LOGD, FL("handle csa offload msg"));
if (!csa_params) {
lim_log(mac_ctx, LOGE, FL("limMsgQ body ptr is NULL"));
@@ -2163,7 +2162,7 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
}
if (!LIM_IS_STA_ROLE(session_entry)) {
- lim_log(mac_ctx, LOG1, FL("Invalid role to handle CSA"));
+ lim_log(mac_ctx, LOGD, FL("Invalid role to handle CSA"));
goto err;
}
@@ -2190,13 +2189,13 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
chnl_switch_info =
&session_entry->gLimWiderBWChannelSwitch;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("vht:%d ht:%d flag:%x chan:%d"),
session_entry->vhtCapability,
session_entry->htSupportedChannelWidthSet,
csa_params->ies_present_flag,
csa_params->channel);
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("seg1:%d seg2:%d width:%d country:%s class:%d"),
csa_params->new_ch_freq_seg1,
csa_params->new_ch_freq_seg2,
@@ -2309,7 +2308,7 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
}
}
- lim_log(mac_ctx, LOG1, FL("new ch width = %d space:%d"),
+ lim_log(mac_ctx, LOGD, FL("new ch width = %d space:%d"),
session_entry->gLimChannelSwitch.ch_width, chan_space);
if ((session_entry->currentOperChannel == csa_params->channel) &&
(session_entry->ch_width ==
@@ -2334,7 +2333,7 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
mmh_msg.type = eWNI_SME_CSA_OFFLOAD_EVENT;
mmh_msg.bodyptr = csa_offload_ind;
mmh_msg.bodyval = 0;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Sending eWNI_SME_CSA_OFFLOAD_EVENT to SME."));
MTRACE(mac_trace_msg_tx
(mac_ctx, session_entry->peSessionId, mmh_msg.type));
@@ -2434,11 +2433,11 @@ void lim_send_sme_max_assoc_exceeded_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMa
pSmeMaxAssocInd->sessionId = smesessionId;
mmhMsg.type = pSmeMaxAssocInd->mesgType;
mmhMsg.bodyptr = pSmeMaxAssocInd;
- PELOG1(lim_log(pMac, LOG1, FL("msgType %s peerMacAddr " MAC_ADDRESS_STR
+ PELOG1(lim_log(pMac, LOGD, FL("msgType %s peerMacAddr " MAC_ADDRESS_STR
" sme session id %d"),
"eWNI_SME_MAX_ASSOC_EXCEEDED",
MAC_ADDR_ARRAY(peerMacAddr));
- )
+ )
MTRACE(mac_trace(pMac, TRACE_CODE_TX_SME_MSG,
smesessionId, mmhMsg.type));
lim_sys_process_mmh_msg_api(pMac, &mmhMsg, ePROT);
@@ -2490,10 +2489,9 @@ lim_send_dfs_chan_sw_ie_update(tpAniSirGlobal pMac, tpPESession psessionEntry)
/* Send update beacon template message */
lim_send_beacon_ind(pMac, psessionEntry);
- PELOG1(lim_log(pMac, LOG1,
- FL(" Updated CSA IE, IE COUNT = %d"),
+ lim_log(pMac, LOGD,
+ FL(" Updated CSA IE, IE COUNT = %d"),
psessionEntry->gLimChannelSwitch.switchCount);
- )
return;
}
@@ -2572,12 +2570,9 @@ lim_send_sme_ap_channel_switch_resp(tpAniSirGlobal pMac,
lim_apply_configuration(pMac, psessionEntry);
lim_send_beacon_ind(pMac, psessionEntry);
} else {
- PELOG1(lim_log(pMac, LOG1,
- FL
- ("Failed to Transmit Beacons on channel = %d"
- "after AP channel change response"),
+ lim_log(pMac, LOGD,
+ FL("Failed to Transmit Beacons on channel = %d after AP channel change response"),
psessionEntry->bcnLen);
- )
}
}
return;
@@ -2616,7 +2611,7 @@ lim_process_beacon_tx_success_ind(tpAniSirGlobal pMac, uint16_t msgType, void *e
return;
}
- lim_log(pMac, LOG1, FL("role:%d swIe:%d opIe:%d"),
+ lim_log(pMac, LOGD, FL("role:%d swIe:%d opIe:%d"),
GET_LIM_SYSTEM_ROLE(psessionEntry),
psessionEntry->dfsIncludeChanSwIe,
psessionEntry->gLimOperatingMode.present);
diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c
index fe16565f0f5e..de378fdb7dc2 100644
--- a/core/mac/src/pe/lim/lim_utils.c
+++ b/core/mac/src/pe/lim/lim_utils.c
@@ -849,7 +849,7 @@ void lim_reset_deferred_msg_q(tpAniSirGlobal pMac)
uint8_t lim_write_deferred_msg_q(tpAniSirGlobal mac_ctx, tpSirMsgQ lim_msg)
{
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Queue a deferred message (size %d, write %d) - type 0x%x "),
mac_ctx->lim.gLimDeferredMsgQ.size,
mac_ctx->lim.gLimDeferredMsgQ.write,
@@ -989,20 +989,15 @@ tSirMsgQ *lim_read_deferred_msg_q(tpAniSirGlobal pMac)
if (pMac->lim.gLimDeferredMsgQ.read >= MAX_DEFERRED_QUEUE_LEN)
pMac->lim.gLimDeferredMsgQ.read = 0;
- PELOG1(lim_log(pMac, LOG1,
- FL
- ("** DeQueue a deferred message (size %d read %d) - type 0x%x **"),
- pMac->lim.gLimDeferredMsgQ.size,
- pMac->lim.gLimDeferredMsgQ.read, msg->type);
- )
+ lim_log(pMac, LOGD,
+ FL("** DeQueue a deferred message (size %d read %d) - type 0x%x **"),
+ pMac->lim.gLimDeferredMsgQ.size,
+ pMac->lim.gLimDeferredMsgQ.read, msg->type);
- PELOG1(lim_log
- (pMac, LOG1,
- FL
- ("DQ msg -- scan %d, global sme %d, global mlme %d, addts %d"),
- lim_is_system_in_scan_state(pMac), pMac->lim.gLimSmeState,
- pMac->lim.gLimMlmState, pMac->lim.gLimAddtsSent);
- )
+ lim_log(pMac, LOGD,
+ FL("DQ msg -- scan %d, global sme %d, global mlme %d, addts %d"),
+ lim_is_system_in_scan_state(pMac), pMac->lim.gLimSmeState,
+ pMac->lim.gLimMlmState, pMac->lim.gLimAddtsSent);
return msg;
}
@@ -1062,7 +1057,7 @@ void lim_handle_update_olbc_cache(tpAniSirGlobal mac_ctx)
if ((!psessionEntry->gLimOlbcParams.numSta) &&
(psessionEntry->gLimOlbcParams.protectionEnabled) &&
(!psessionEntry->gLim11bParams.protectionEnabled)) {
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Overlap cache clear and no 11B STA set"));
lim_enable11g_protection(mac_ctx, false, true,
&beaconParams,
@@ -1072,7 +1067,7 @@ void lim_handle_update_olbc_cache(tpAniSirGlobal mac_ctx)
if ((!psessionEntry->gLimOverlap11gParams.numSta) &&
(psessionEntry->gLimOverlap11gParams.protectionEnabled)
&& (!psessionEntry->gLim11gParams.protectionEnabled)) {
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Overlap cache clear and no 11G STA set"));
lim_enable_ht_protection_from11g(mac_ctx, false, true,
&beaconParams,
@@ -1082,7 +1077,7 @@ void lim_handle_update_olbc_cache(tpAniSirGlobal mac_ctx)
if ((!psessionEntry->gLimOverlapHt20Params.numSta) &&
(psessionEntry->gLimOverlapHt20Params.protectionEnabled)
&& (!psessionEntry->gLimHt20Params.protectionEnabled)) {
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Overlap cache clear and no HT20 STA set"));
lim_enable11g_protection(mac_ctx, false, true,
&beaconParams,
@@ -1170,28 +1165,22 @@ lim_update_prot_sta_params(tpAniSirGlobal pMac,
{
uint32_t i;
- PELOG1(lim_log(pMac, LOG1, FL("A STA is associated:"));
- lim_log(pMac, LOG1, FL("Addr : "));
- lim_print_mac_addr(pMac, peerMacAddr, LOG1);
- )
+ lim_log(pMac, LOGD, FL("Associated STA addr is:"));
+ lim_print_mac_addr(pMac, peerMacAddr, LOGD);
for (i = 0; i < LIM_PROT_STA_CACHE_SIZE; i++) {
if (psessionEntry->protStaCache[i].active) {
- PELOG1(lim_log(pMac, LOG1, FL("Addr: "));)
- PELOG1(lim_print_mac_addr
- (pMac, psessionEntry->protStaCache[i].addr,
- LOG1);
- )
+ lim_log(pMac, LOGD, FL("Addr: "));
+ lim_print_mac_addr
+ (pMac, psessionEntry->protStaCache[i].addr,
+ LOGD);
if (!qdf_mem_cmp
(psessionEntry->protStaCache[i].addr,
peerMacAddr, sizeof(tSirMacAddr))) {
- PELOG1(lim_log
- (pMac, LOG1,
- FL
- ("matching cache entry at %d already active."),
- i);
- )
+ lim_log(pMac, LOGD,
+ FL("matching cache entry at %d already active."),
+ i);
return;
}
}
@@ -1203,7 +1192,7 @@ lim_update_prot_sta_params(tpAniSirGlobal pMac,
}
if (i >= LIM_PROT_STA_CACHE_SIZE) {
- PELOGE(lim_log(pMac, LOGE, FL("No space in ProtStaCache"));)
+ lim_log(pMac, LOGE, FL("No space in ProtStaCache"));
return;
}
@@ -1214,22 +1203,22 @@ lim_update_prot_sta_params(tpAniSirGlobal pMac,
psessionEntry->protStaCache[i].active = true;
if (eLIM_PROT_STA_CACHE_TYPE_llB == protStaCacheType) {
psessionEntry->gLim11bParams.numSta++;
- lim_log(pMac, LOG1, FL("11B, "));
+ lim_log(pMac, LOGD, FL("11B, "));
} else if (eLIM_PROT_STA_CACHE_TYPE_llG == protStaCacheType) {
psessionEntry->gLim11gParams.numSta++;
- lim_log(pMac, LOG1, FL("11G, "));
+ lim_log(pMac, LOGD, FL("11G, "));
} else if (eLIM_PROT_STA_CACHE_TYPE_HT20 == protStaCacheType) {
psessionEntry->gLimHt20Params.numSta++;
- lim_log(pMac, LOG1, FL("HT20, "));
+ lim_log(pMac, LOGD, FL("HT20, "));
}
if (!gfSupported) {
psessionEntry->gLimNonGfParams.numSta++;
- lim_log(pMac, LOG1, FL("NonGf, "));
+ lim_log(pMac, LOGD, FL("NonGf, "));
}
if (!lsigTxopSupported) {
psessionEntry->gLimLsigTxopParams.numSta++;
- lim_log(pMac, LOG1, FL("!lsigTxopSupported"));
+ lim_log(pMac, LOGD, FL("!lsigTxopSupported"));
}
} /* --------------------------------------------------------------------- */
@@ -1261,7 +1250,7 @@ lim_decide_ap_protection(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr,
dph_lookup_hash_entry(pMac, peerMacAddr, &tmpAid,
&psessionEntry->dph.dphHashTable);
if (NULL == pStaDs) {
- PELOG1(lim_log(pMac, LOG1, FL("pStaDs is NULL"));)
+ lim_log(pMac, LOGE, FL("pStaDs is NULL"));
return;
}
lim_get_rf_band_new(pMac, &rfBand, psessionEntry);
@@ -1378,7 +1367,7 @@ lim_enable_overlap11g_protection(tpAniSirGlobal pMac,
if (psessionEntry->gLimOlbcParams.numSta &&
!psessionEntry->gLimOlbcParams.protectionEnabled) {
/* enable protection */
- PELOG1(lim_log(pMac, LOG1, FL("OLBC happens!!!"));)
+ lim_log(pMac, LOGD, FL("OLBC happens!!!"));
lim_enable11g_protection(pMac, true, true, pBeaconParams,
psessionEntry);
}
@@ -1418,10 +1407,10 @@ lim_update_short_preamble(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr,
if (sta_ds->shortPreambleEnabled != eHAL_CLEAR)
return;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Short Preamble is not enabled in Assoc Req from "));
- lim_print_mac_addr(mac_ctx, peer_mac_addr, LOG1);
+ lim_print_mac_addr(mac_ctx, peer_mac_addr, LOGD);
for (i = 0; i < LIM_PROT_STA_CACHE_SIZE; i++) {
if (LIM_IS_AP_ROLE(psession_entry) &&
@@ -1489,7 +1478,7 @@ lim_update_short_preamble(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr,
}
/* enable long preamble */
- lim_log(mac_ctx, LOG1, FL("Disabling short preamble"));
+ lim_log(mac_ctx, LOGD, FL("Disabling short preamble"));
if (lim_enable_short_preamble(mac_ctx, false, beaconparams,
psession_entry) != eSIR_SUCCESS)
@@ -1538,8 +1527,9 @@ lim_update_short_slot_time(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr,
if (sta_ds->shortSlotTimeEnabled != eHAL_CLEAR)
return;
- lim_log(mac_ctx, LOG1, FL("Short Slot Time is not enabled in Assoc Req from "));
- lim_print_mac_addr(mac_ctx, peer_mac_addr, LOG1);
+ lim_log(mac_ctx, LOGD,
+ FL("Short Slot Time is not enabled in Assoc Req from "));
+ lim_print_mac_addr(mac_ctx, peer_mac_addr, LOGD);
for (i = 0; i < LIM_PROT_STA_CACHE_SIZE; i++) {
if (LIM_IS_AP_ROLE(session_entry) &&
session_entry->gLimNoShortSlotParams.
@@ -1619,7 +1609,7 @@ lim_update_short_slot_time(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr,
beacon_params->fShortSlotTime = false;
beacon_params->paramChangeBitmap |=
PARAM_SHORT_SLOT_TIME_CHANGED;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Disable short slot time. Enable long slot time."));
session_entry->shortSlotTimeSupported = false;
} else if (!LIM_IS_AP_ROLE(session_entry) &&
@@ -1630,7 +1620,7 @@ lim_update_short_slot_time(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr,
beacon_params->fShortSlotTime = false;
beacon_params->paramChangeBitmap |=
PARAM_SHORT_SLOT_TIME_CHANGED;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Disable short slot time. Enable long slot time."));
session_entry->shortSlotTimeSupported = false;
}
@@ -2025,7 +2015,7 @@ static void lim_csa_ecsa_handler(tpAniSirGlobal mac_ctx, tpPESession session)
new_channel = session->gLimChannelSwitch.primaryChannel;
switch (session->gLimChannelSwitch.state) {
case eLIM_CHANNEL_SWITCH_PRIMARY_ONLY:
- lim_log(mac_ctx, LOG1, FL("CHANNEL_SWITCH_PRIMARY_ONLY "));
+ lim_log(mac_ctx, LOGD, FL("CHANNEL_SWITCH_PRIMARY_ONLY "));
if (!CDS_IS_SAME_BAND_CHANNELS(old_channel, new_channel)) {
lim_trigger_channel_switch_through_roaming(
session->smeSessionId, session->bssId,
@@ -2038,7 +2028,7 @@ static void lim_csa_ecsa_handler(tpAniSirGlobal mac_ctx, tpPESession session)
session->gLimChannelSwitch.state = eLIM_CHANNEL_SWITCH_IDLE;
break;
case eLIM_CHANNEL_SWITCH_PRIMARY_AND_SECONDARY:
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("CHANNEL_SWITCH_PRIMARY_AND_SECONDARY"));
if (!CDS_IS_SAME_BAND_CHANNELS(old_channel, new_channel)) {
lim_trigger_channel_switch_through_roaming(
@@ -2072,14 +2062,14 @@ static void lim_csa_ecsa_handler(tpAniSirGlobal mac_ctx, tpPESession session)
new_channel = session->gLimChannelSwitch.primaryChannel;
switch (session->gLimChannelSwitch.state) {
case eLIM_CHANNEL_SWITCH_PRIMARY_ONLY:
- lim_log(mac_ctx, LOG1, FL("CHANNEL_SWITCH_PRIMARY_ONLY "));
+ lim_log(mac_ctx, LOGD, FL("CHANNEL_SWITCH_PRIMARY_ONLY "));
lim_switch_primary_channel(mac_ctx,
session->gLimChannelSwitch.primaryChannel,
session);
session->gLimChannelSwitch.state = eLIM_CHANNEL_SWITCH_IDLE;
break;
case eLIM_CHANNEL_SWITCH_PRIMARY_AND_SECONDARY:
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("CHANNEL_SWITCH_PRIMARY_AND_SECONDARY"));
lim_switch_primary_secondary_channel(mac_ctx, session,
session->gLimChannelSwitch.primaryChannel,
@@ -2303,27 +2293,22 @@ void lim_cancel_dot11h_channel_switch(tpAniSirGlobal pMac,
if (!LIM_IS_STA_ROLE(psessionEntry))
return;
- PELOGW(lim_log
- (pMac, LOGW, FL("Received a beacon without channel switch IE"));
- )
+ lim_log(pMac, LOGW, FL("Received a beacon without channel switch IE"));
+
MTRACE(mac_trace
(pMac, TRACE_CODE_TIMER_DEACTIVATE,
psessionEntry->peSessionId, eLIM_CHANNEL_SWITCH_TIMER));
if (tx_timer_deactivate(&pMac->lim.limTimers.gLimChannelSwitchTimer) !=
eSIR_SUCCESS) {
- PELOGE(lim_log(pMac, LOGE, FL("tx_timer_deactivate failed!"));)
+ lim_log(pMac, LOGE, FL("tx_timer_deactivate failed!"));
}
/* We need to restore pre-channelSwitch state on the STA */
if (lim_restore_pre_channel_switch_state(pMac, psessionEntry) !=
eSIR_SUCCESS) {
- PELOGE(lim_log
- (pMac, LOGE,
- FL
- ("LIM: Could not restore pre-channelSwitch (11h) state, resetting the system"));
- )
-
+ lim_log(pMac, LOGE,
+ FL("LIM: Could not restore pre-channelSwitch (11h) state, resetting the system"));
}
}
@@ -2349,9 +2334,7 @@ void lim_cancel_dot11h_quiet(tpAniSirGlobal pMac, tpPESession psessionEntry)
psessionEntry->peSessionId, eLIM_QUIET_TIMER));
if (tx_timer_deactivate(&pMac->lim.limTimers.gLimQuietTimer) !=
TX_SUCCESS) {
- PELOGE(lim_log
- (pMac, LOGE, FL("tx_timer_deactivate failed"));
- )
+ lim_log(pMac, LOGE, FL("tx_timer_deactivate failed"));
}
} else if (psessionEntry->gLimSpecMgmt.quietState == eLIM_QUIET_RUNNING) {
MTRACE(mac_trace
@@ -2359,9 +2342,7 @@ void lim_cancel_dot11h_quiet(tpAniSirGlobal pMac, tpPESession psessionEntry)
psessionEntry->peSessionId, eLIM_QUIET_BSS_TIMER));
if (tx_timer_deactivate(&pMac->lim.limTimers.gLimQuietBssTimer)
!= TX_SUCCESS) {
- PELOGE(lim_log
- (pMac, LOGE, FL("tx_timer_deactivate failed"));
- )
+ lim_log(pMac, LOGE, FL("tx_timer_deactivate failed"));
}
/**
* If the channel switch is already running in silent mode, dont resume the
@@ -2421,10 +2402,8 @@ void lim_process_quiet_timeout(tpAniSirGlobal pMac)
return;
}
- PELOG1(lim_log
- (pMac, LOG1, FL("quietState = %d"),
+ lim_log(pMac, LOGD, FL("quietState = %d"),
psessionEntry->gLimSpecMgmt.quietState);
- )
switch (psessionEntry->gLimSpecMgmt.quietState) {
case eLIM_QUIET_BEGIN:
/* Time to Stop data traffic for quietDuration */
@@ -2526,7 +2505,7 @@ void lim_process_quiet_bss_timeout(tpAniSirGlobal mac_ctx)
return;
}
- lim_log(mac_ctx, LOG1, FL("quietState = %d"),
+ lim_log(mac_ctx, LOGD, FL("quietState = %d"),
psession_entry->gLimSpecMgmt.quietState);
if (LIM_IS_AP_ROLE(psession_entry))
@@ -2740,7 +2719,7 @@ void lim_switch_channel_cback(tpAniSirGlobal pMac, QDF_STATUS status,
pSirSmeSwitchChInd->chan_params.center_freq_seg1 =
psessionEntry->gLimChannelSwitch.ch_center_freq_seg1;
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("session:%d chan:%d width:%d sec offset:%d seg0:%d seg1:%d"),
pSirSmeSwitchChInd->sessionId,
pSirSmeSwitchChInd->newChannelId,
@@ -2892,9 +2871,7 @@ uint8_t lim_active_scan_allowed(tpAniSirGlobal pMac, uint8_t channelNum)
uint32_t len = WNI_CFG_SCAN_CONTROL_LIST_LEN;
if (wlan_cfg_get_str(pMac, WNI_CFG_SCAN_CONTROL_LIST, channelPair, &len)
!= eSIR_SUCCESS) {
- PELOGE(lim_log
- (pMac, LOGE, FL("Unable to get scan control list"));
- )
+ lim_log(pMac, LOGE, FL("Unable to get scan control list"));
return false;
}
@@ -3378,7 +3355,7 @@ lim_handle_enable11g_protection_enabled(tpAniSirGlobal mac_ctx,
if (LIM_IS_AP_ROLE(session_entry) && overlap) {
session_entry->gLimOlbcParams.protectionEnabled = true;
- lim_log(mac_ctx, LOG1, FL("protection from olbc is enabled"));
+ lim_log(mac_ctx, LOGD, FL("protection from olbc is enabled"));
if (true == session_entry->htCapability) {
if ((eSIR_HT_OP_MODE_OVERLAP_LEGACY !=
@@ -3408,7 +3385,7 @@ lim_handle_enable11g_protection_enabled(tpAniSirGlobal mac_ctx,
}
} else if (LIM_IS_AP_ROLE(session_entry) && !overlap) {
session_entry->gLim11bParams.protectionEnabled = true;
- lim_log(mac_ctx, LOG1, FL("protection from 11b is enabled"));
+ lim_log(mac_ctx, LOGD, FL("protection from 11b is enabled"));
if (true == session_entry->htCapability) {
if (eSIR_HT_OP_MODE_MIXED !=
session_entry->htOperMode) {
@@ -3426,7 +3403,7 @@ lim_handle_enable11g_protection_enabled(tpAniSirGlobal mac_ctx,
/* This part is common for staiton as well. */
if (false == session_entry->beaconParams.llbCoexist) {
- lim_log(mac_ctx, LOG1, FL("=> 11G Protection Enabled"));
+ lim_log(mac_ctx, LOGD, FL("=> 11G Protection Enabled"));
beaconparams->llbCoexist =
session_entry->beaconParams.llbCoexist = true;
beaconparams->paramChangeBitmap |=
@@ -3498,7 +3475,7 @@ lim_handle_11g_protection_for_11bcoexist(tpAniSirGlobal mac_ctx,
} else if (LIM_IS_AP_ROLE(session_entry) && !overlap) {
/* Disable protection from 11B stations. */
session_entry->gLim11bParams.protectionEnabled = false;
- lim_log(mac_ctx, LOG1, FL("===> 11B Protection Disabled"));
+ lim_log(mac_ctx, LOGD, FL("===> 11B Protection Disabled"));
/* Check if any other non-HT protection enabled. */
if (!session_entry->gLim11gParams.protectionEnabled) {
/* Right now we are in HT OP Mixed mode. */
@@ -3518,7 +3495,7 @@ lim_handle_11g_protection_for_11bcoexist(tpAniSirGlobal mac_ctx,
protectionEnabled) {
session_entry->htOperMode =
eSIR_HT_OP_MODE_OVERLAP_LEGACY;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("===> 11G Protection Disabled"));
lim_enable_ht_rifs_protection(mac_ctx, true,
overlap, beaconparams,
@@ -3530,7 +3507,7 @@ lim_handle_11g_protection_for_11bcoexist(tpAniSirGlobal mac_ctx,
eSIR_HT_OP_MODE_NO_LEGACY_20MHZ_HT; */
session_entry->htOperMode =
eSIR_HT_OP_MODE_PURE;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("===> 11G Protection Disabled"));
lim_enable_ht_rifs_protection(mac_ctx, false,
overlap, beaconparams,
@@ -3547,7 +3524,7 @@ lim_handle_11g_protection_for_11bcoexist(tpAniSirGlobal mac_ctx,
if (LIM_IS_AP_ROLE(session_entry)) {
if (!session_entry->gLimOlbcParams.protectionEnabled &&
!session_entry->gLim11bParams.protectionEnabled) {
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("===> 11G Protection Disabled"));
beaconparams->llbCoexist =
session_entry->beaconParams.llbCoexist =
@@ -3558,7 +3535,7 @@ lim_handle_11g_protection_for_11bcoexist(tpAniSirGlobal mac_ctx,
}
/* For station role */
if (!LIM_IS_AP_ROLE(session_entry)) {
- lim_log(mac_ctx, LOG1, FL("===> 11G Protection Disabled"));
+ lim_log(mac_ctx, LOGD, FL("===> 11G Protection Disabled"));
beaconparams->llbCoexist =
session_entry->beaconParams.llbCoexist = false;
beaconparams->paramChangeBitmap |=
@@ -3590,13 +3567,13 @@ lim_enable11g_protection(tpAniSirGlobal mac_ctx, uint8_t enable,
if ((LIM_IS_AP_ROLE(session_entry)) &&
!session_entry->cfgProtection.fromllb) {
/* protection disabled. */
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("protection from 11b is disabled"));
return eSIR_SUCCESS;
} else if (!LIM_IS_AP_ROLE(session_entry)) {
if (!mac_ctx->lim.cfgProtection.fromllb) {
/* protection disabled. */
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("protection from 11b is disabled"));
return eSIR_SUCCESS;
}
@@ -3829,11 +3806,9 @@ lim_enable_ht_protection_from11g(tpAniSirGlobal pMac, uint8_t enable,
protectionEnabled
&& !psessionEntry->gLim11gParams.
protectionEnabled) {
- PELOG1(lim_log
- (pMac, LOG1,
- FL
- ("===> Protection from 11G Disabled"));
- )
+ lim_log(pMac, LOGD,
+ FL("===> Protection from 11G Disabled"));
+
pBeaconParams->llgCoexist =
psessionEntry->beaconParams.llgCoexist =
false;
@@ -3843,10 +3818,9 @@ lim_enable_ht_protection_from11g(tpAniSirGlobal pMac, uint8_t enable,
}
/* for station role */
else {
- PELOG1(lim_log
- (pMac, LOG1,
- FL("===> Protection from 11G Disabled"));
- )
+ lim_log(pMac, LOGD,
+ FL("===> Protection from 11G Disabled"));
+
pBeaconParams->llgCoexist =
psessionEntry->beaconParams.llgCoexist = false;
pBeaconParams->paramChangeBitmap |=
@@ -3884,18 +3858,14 @@ lim_enable_ht_obss_protection(tpAniSirGlobal pMac, uint8_t enable,
if ((LIM_IS_AP_ROLE(psessionEntry)) &&
!psessionEntry->cfgProtection.obss) { /* ToDo Update this field */
/* protection disabled. */
- PELOG1(lim_log
- (pMac, LOG1,
- FL("protection from Obss is disabled"));
- )
+ lim_log(pMac, LOGD,
+ FL("protection from Obss is disabled"));
return eSIR_SUCCESS;
} else if (!LIM_IS_AP_ROLE(psessionEntry)) {
if (!pMac->lim.cfgProtection.obss) { /* ToDo Update this field */
/* protection disabled. */
- PELOG1(lim_log
- (pMac, LOG1,
- FL("protection from Obss is disabled"));
- )
+ lim_log(pMac, LOGD,
+ FL("protection from Obss is disabled"));
return eSIR_SUCCESS;
}
}
@@ -3904,19 +3874,17 @@ lim_enable_ht_obss_protection(tpAniSirGlobal pMac, uint8_t enable,
if (LIM_IS_AP_ROLE(psessionEntry)) {
if ((enable)
&& (false == psessionEntry->beaconParams.gHTObssMode)) {
- PELOG1(lim_log
- (pMac, LOG1, FL("=>obss protection enabled"));
- )
+ lim_log(pMac, LOGD, FL("=>obss protection enabled"));
+
psessionEntry->beaconParams.gHTObssMode = true;
pBeaconParams->paramChangeBitmap |= PARAM_OBSS_MODE_CHANGED; /* UPDATE AN ENUM FOR OBSS MODE <todo> */
} else if (!enable
&& (true ==
psessionEntry->beaconParams.gHTObssMode)) {
- PELOG1(lim_log
- (pMac, LOG1,
- FL("===> obss Protection disabled"));
- )
+ lim_log(pMac, LOGD,
+ FL("===> obss Protection disabled"));
+
psessionEntry->beaconParams.gHTObssMode = false;
pBeaconParams->paramChangeBitmap |=
PARAM_OBSS_MODE_CHANGED;
@@ -3930,20 +3898,17 @@ lim_enable_ht_obss_protection(tpAniSirGlobal pMac, uint8_t enable,
} else {
if ((enable)
&& (false == psessionEntry->beaconParams.gHTObssMode)) {
- PELOG1(lim_log
- (pMac, LOG1, FL("=>obss protection enabled"));
- )
+ lim_log(pMac, LOGD, FL("=>obss protection enabled"));
+
psessionEntry->beaconParams.gHTObssMode = true;
pBeaconParams->paramChangeBitmap |= PARAM_OBSS_MODE_CHANGED; /* UPDATE AN ENUM FOR OBSS MODE <todo> */
} else if (!enable
&& (true ==
psessionEntry->beaconParams.gHTObssMode)) {
+ lim_log(pMac, LOGD,
+ FL("===> obss Protection disabled"));
- PELOG1(lim_log
- (pMac, LOG1,
- FL("===> obss Protection disabled"));
- )
psessionEntry->beaconParams.gHTObssMode = false;
pBeaconParams->paramChangeBitmap |=
PARAM_OBSS_MODE_CHANGED;
@@ -3998,7 +3963,7 @@ static void lim_handle_ht20protection_enabled(tpAniSirGlobal mac_ctx,
}
/* This part is common for staiton as well. */
if (false == session_entry->beaconParams.ht20Coexist) {
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("=> Protection from HT20 Enabled"));
beaconparams->ht20MhzCoexist =
session_entry->beaconParams.ht20Coexist = true;
@@ -4082,7 +4047,7 @@ static void lim_handle_ht20coexist_ht20protection(tpAniSirGlobal mac_ctx,
}
}
if (LIM_IS_AP_ROLE(session_entry)) {
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("===> Protection from HT 20 Disabled"));
beaconparams->ht20MhzCoexist =
session_entry->beaconParams.ht20Coexist = false;
@@ -4091,7 +4056,7 @@ static void lim_handle_ht20coexist_ht20protection(tpAniSirGlobal mac_ctx,
}
if (!LIM_IS_AP_ROLE(session_entry)) {
/* For station role */
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("===> Protection from HT20 Disabled"));
beaconparams->ht20MhzCoexist =
session_entry->beaconParams.ht20Coexist = false;
@@ -4172,20 +4137,15 @@ lim_enable_ht_non_gf_protection(tpAniSirGlobal pMac, uint8_t enable,
if (LIM_IS_AP_ROLE(psessionEntry) &&
!psessionEntry->cfgProtection.nonGf) {
/* protection disabled. */
- PELOG3(lim_log
- (pMac, LOG3,
- FL("protection from NonGf is disabled"));
- )
+ lim_log(pMac, LOGD,
+ FL("protection from NonGf is disabled"));
return eSIR_SUCCESS;
} else if (!LIM_IS_AP_ROLE(psessionEntry)) {
/* normal protection config check */
if (!pMac->lim.cfgProtection.nonGf) {
/* protection disabled. */
- PELOG3(lim_log
- (pMac, LOG3,
- FL
- ("protection from NonGf is disabled"));
- )
+ lim_log(pMac, LOGD,
+ FL("protection from NonGf is disabled"));
return eSIR_SUCCESS;
}
}
@@ -4193,10 +4153,9 @@ lim_enable_ht_non_gf_protection(tpAniSirGlobal pMac, uint8_t enable,
if (LIM_IS_AP_ROLE(psessionEntry)) {
if ((enable)
&& (false == psessionEntry->beaconParams.llnNonGFCoexist)) {
- PELOG1(lim_log
- (pMac, LOG1,
- FL(" => Protection from non GF Enabled"));
- )
+ lim_log(pMac, LOGD,
+ FL(" => Protection from non GF Enabled"));
+
pBeaconParams->llnNonGFCoexist =
psessionEntry->beaconParams.llnNonGFCoexist = true;
pBeaconParams->paramChangeBitmap |=
@@ -4204,10 +4163,9 @@ lim_enable_ht_non_gf_protection(tpAniSirGlobal pMac, uint8_t enable,
} else if (!enable
&& (true ==
psessionEntry->beaconParams.llnNonGFCoexist)) {
- PELOG1(lim_log
- (pMac, LOG1,
- FL("===> Protection from Non GF Disabled"));
- )
+ lim_log(pMac, LOGD,
+ FL("===> Protection from Non GF Disabled"));
+
pBeaconParams->llnNonGFCoexist =
psessionEntry->beaconParams.llnNonGFCoexist = false;
pBeaconParams->paramChangeBitmap |=
@@ -4216,10 +4174,9 @@ lim_enable_ht_non_gf_protection(tpAniSirGlobal pMac, uint8_t enable,
} else {
if ((enable)
&& (false == psessionEntry->beaconParams.llnNonGFCoexist)) {
- PELOG1(lim_log
- (pMac, LOG1,
- FL(" => Protection from non GF Enabled"));
- )
+ lim_log(pMac, LOGD,
+ FL(" => Protection from non GF Enabled"));
+
pBeaconParams->llnNonGFCoexist =
psessionEntry->beaconParams.llnNonGFCoexist = true;
pBeaconParams->paramChangeBitmap |=
@@ -4227,10 +4184,9 @@ lim_enable_ht_non_gf_protection(tpAniSirGlobal pMac, uint8_t enable,
} else if (!enable
&& (true ==
psessionEntry->beaconParams.llnNonGFCoexist)) {
- PELOG1(lim_log
- (pMac, LOG1,
- FL("===> Protection from Non GF Disabled"));
- )
+ lim_log(pMac, LOGD,
+ FL("===> Protection from Non GF Disabled"));
+
pBeaconParams->llnNonGFCoexist =
psessionEntry->beaconParams.llnNonGFCoexist = false;
pBeaconParams->paramChangeBitmap |=
@@ -4265,21 +4221,15 @@ lim_enable_ht_lsig_txop_protection(tpAniSirGlobal pMac, uint8_t enable,
if (LIM_IS_AP_ROLE(psessionEntry) &&
!psessionEntry->cfgProtection.lsigTxop) {
/* protection disabled. */
- PELOG3(lim_log
- (pMac, LOG3,
- FL
- (" protection from LsigTxop not supported is disabled"));
- )
+ lim_log(pMac, LOGD,
+ FL(" protection from LsigTxop not supported is disabled"));
return eSIR_SUCCESS;
} else if (!LIM_IS_AP_ROLE(psessionEntry)) {
/* normal protection config check */
if (!pMac->lim.cfgProtection.lsigTxop) {
/* protection disabled. */
- PELOG3(lim_log
- (pMac, LOG3,
- FL
- (" protection from LsigTxop not supported is disabled"));
- )
+ lim_log(pMac, LOGD,
+ FL(" protection from LsigTxop not supported is disabled"));
return eSIR_SUCCESS;
}
}
@@ -4290,10 +4240,9 @@ lim_enable_ht_lsig_txop_protection(tpAniSirGlobal pMac, uint8_t enable,
&& (false ==
psessionEntry->beaconParams.
fLsigTXOPProtectionFullSupport)) {
- PELOG1(lim_log
- (pMac, LOG1,
- FL(" => Protection from LsigTxop Enabled"));
- )
+ lim_log(pMac, LOGD,
+ FL(" => Protection from LsigTxop Enabled"));
+
pBeaconParams->fLsigTXOPProtectionFullSupport =
psessionEntry->beaconParams.
fLsigTXOPProtectionFullSupport = true;
@@ -4303,10 +4252,9 @@ lim_enable_ht_lsig_txop_protection(tpAniSirGlobal pMac, uint8_t enable,
&& (true ==
psessionEntry->beaconParams.
fLsigTXOPProtectionFullSupport)) {
- PELOG1(lim_log
- (pMac, LOG1,
- FL("===> Protection from LsigTxop Disabled"));
- )
+ lim_log(pMac, LOGD,
+ FL("===> Protection from LsigTxop Disabled"));
+
pBeaconParams->fLsigTXOPProtectionFullSupport =
psessionEntry->beaconParams.
fLsigTXOPProtectionFullSupport = false;
@@ -4318,10 +4266,9 @@ lim_enable_ht_lsig_txop_protection(tpAniSirGlobal pMac, uint8_t enable,
&& (false ==
psessionEntry->beaconParams.
fLsigTXOPProtectionFullSupport)) {
- PELOG1(lim_log
- (pMac, LOG1,
- FL(" => Protection from LsigTxop Enabled"));
- )
+ lim_log(pMac, LOGD,
+ FL(" => Protection from LsigTxop Enabled"));
+
pBeaconParams->fLsigTXOPProtectionFullSupport =
psessionEntry->beaconParams.
fLsigTXOPProtectionFullSupport = true;
@@ -4331,10 +4278,9 @@ lim_enable_ht_lsig_txop_protection(tpAniSirGlobal pMac, uint8_t enable,
&& (true ==
psessionEntry->beaconParams.
fLsigTXOPProtectionFullSupport)) {
- PELOG1(lim_log
- (pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("===> Protection from LsigTxop Disabled"));
- )
+
pBeaconParams->fLsigTXOPProtectionFullSupport =
psessionEntry->beaconParams.
fLsigTXOPProtectionFullSupport = false;
@@ -4370,20 +4316,16 @@ lim_enable_ht_rifs_protection(tpAniSirGlobal pMac, uint8_t enable,
if (LIM_IS_AP_ROLE(psessionEntry) &&
!psessionEntry->cfgProtection.rifs) {
/* protection disabled. */
- PELOG3(lim_log
- (pMac, LOG3,
- FL(" protection from Rifs is disabled"));
- )
+ lim_log(pMac, LOGD,
+ FL(" protection from Rifs is disabled"));
+
return eSIR_SUCCESS;
} else if (!LIM_IS_AP_ROLE(psessionEntry)) {
/* normal protection config check */
if (!pMac->lim.cfgProtection.rifs) {
/* protection disabled. */
- PELOG3(lim_log
- (pMac, LOG3,
- FL
- (" protection from Rifs is disabled"));
- )
+ lim_log(pMac, LOGD,
+ FL(" protection from Rifs is disabled"));
return eSIR_SUCCESS;
}
}
@@ -4393,9 +4335,8 @@ lim_enable_ht_rifs_protection(tpAniSirGlobal pMac, uint8_t enable,
/* Disabling the RIFS Protection means Enable the RIFS mode of operation in the BSS */
if ((!enable)
&& (false == psessionEntry->beaconParams.fRIFSMode)) {
- PELOG1(lim_log
- (pMac, LOG1, FL(" => Rifs protection Disabled"));
- )
+ lim_log(pMac, LOGD, FL(" => Rifs protection Disabled"));
+
pBeaconParams->fRIFSMode =
psessionEntry->beaconParams.fRIFSMode = true;
pBeaconParams->paramChangeBitmap |=
@@ -4404,9 +4345,8 @@ lim_enable_ht_rifs_protection(tpAniSirGlobal pMac, uint8_t enable,
/* Enabling the RIFS Protection means Disable the RIFS mode of operation in the BSS */
else if (enable
&& (true == psessionEntry->beaconParams.fRIFSMode)) {
- PELOG1(lim_log
- (pMac, LOG1, FL("===> Rifs Protection Enabled"));
- )
+ lim_log(pMac, LOGD, FL("===> Rifs Protection Enabled"));
+
pBeaconParams->fRIFSMode =
psessionEntry->beaconParams.fRIFSMode = false;
pBeaconParams->paramChangeBitmap |=
@@ -4416,9 +4356,8 @@ lim_enable_ht_rifs_protection(tpAniSirGlobal pMac, uint8_t enable,
/* Disabling the RIFS Protection means Enable the RIFS mode of operation in the BSS */
if ((!enable)
&& (false == psessionEntry->beaconParams.fRIFSMode)) {
- PELOG1(lim_log
- (pMac, LOG1, FL(" => Rifs protection Disabled"));
- )
+ lim_log(pMac, LOGD, FL(" => Rifs protection Disabled"));
+
pBeaconParams->fRIFSMode =
psessionEntry->beaconParams.fRIFSMode = true;
pBeaconParams->paramChangeBitmap |=
@@ -4427,9 +4366,8 @@ lim_enable_ht_rifs_protection(tpAniSirGlobal pMac, uint8_t enable,
/* Enabling the RIFS Protection means Disable the RIFS mode of operation in the BSS */
else if (enable
&& (true == psessionEntry->beaconParams.fRIFSMode)) {
- PELOG1(lim_log
- (pMac, LOG1, FL("===> Rifs Protection Enabled"));
- )
+ lim_log(pMac, LOGD, FL("===> Rifs Protection Enabled"));
+
pBeaconParams->fRIFSMode =
psessionEntry->beaconParams.fRIFSMode = false;
pBeaconParams->paramChangeBitmap |=
@@ -4486,9 +4424,8 @@ lim_enable_short_preamble(tpAniSirGlobal pMac, uint8_t enable,
if (LIM_IS_AP_ROLE(psessionEntry)) {
if (enable && (psessionEntry->beaconParams.fShortPreamble == 0)) {
- PELOG1(lim_log
- (pMac, LOG1, FL("===> Short Preamble Enabled"));
- )
+ lim_log(pMac, LOGD, FL("===> Short Preamble Enabled"));
+
psessionEntry->beaconParams.fShortPreamble = true;
pBeaconParams->fShortPreamble =
(uint8_t) psessionEntry->beaconParams.
@@ -4498,9 +4435,9 @@ lim_enable_short_preamble(tpAniSirGlobal pMac, uint8_t enable,
} else if (!enable
&& (psessionEntry->beaconParams.fShortPreamble ==
1)) {
- PELOG1(lim_log
- (pMac, LOG1, FL("===> Short Preamble Disabled"));
- )
+ lim_log(pMac, LOGD,
+ FL("===> Short Preamble Disabled"));
+
psessionEntry->beaconParams.fShortPreamble = false;
pBeaconParams->fShortPreamble =
(uint8_t) psessionEntry->beaconParams.
@@ -4599,7 +4536,7 @@ void lim_update_sta_run_time_ht_switch_chnl_params(tpAniSirGlobal pMac,
* end...
*/
if (pMac->lim.gpLimRemainOnChanReq) {
- lim_log(pMac, LOG1, FL("RoC is in progress"));
+ lim_log(pMac, LOGD, FL("RoC is in progress"));
return;
}
@@ -4915,7 +4852,7 @@ lim_validate_delts_req(tpAniSirGlobal mac_ctx, tpSirDeltsReq delts_req,
tsinfo = delts_req->req.wmeTspecPresent ? &delts_req->req.tspec.tsinfo
: &delts_req->req.tsinfo;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("received DELTS_REQ message (wmeTspecPresent = %d, lleTspecPresent = %d, wsmTspecPresent = %d, tsid %d, up %d, direction = %d)"),
delts_req->req.wmeTspecPresent,
delts_req->req.lleTspecPresent,
@@ -5017,11 +4954,9 @@ void lim_process_del_ts_ind(tpAniSirGlobal pMac, tpSirMsgQ limMsg)
pTspecInfo = &(pMac->lim.tspecInfo[pDelTsParam->tspecIdx]);
if (pTspecInfo->inuse == false) {
- PELOGE(lim_log
- (pMac, LOGE,
- FL("tspec entry with index %d is not in use"),
- pDelTsParam->tspecIdx);
- )
+ lim_log(pMac, LOGE,
+ FL("tspec entry with index %d is not in use"),
+ pDelTsParam->tspecIdx);
goto error1;
}
@@ -5037,7 +4972,7 @@ void lim_process_del_ts_ind(tpAniSirGlobal pMac, tpSirMsgQ limMsg)
pDelTsReq = qdf_mem_malloc(sizeof(tSirDeltsReq));
if (NULL == pDelTsReq) {
- PELOGE(lim_log(pMac, LOGE, FL("AllocateMemory() failed"));)
+ lim_log(pMac, LOGE, FL("AllocateMemory() failed"));
goto error1;
}
@@ -5052,13 +4987,12 @@ void lim_process_del_ts_ind(tpAniSirGlobal pMac, tpSirMsgQ limMsg)
/* validate the req */
if (eSIR_SUCCESS !=
lim_validate_delts_req(pMac, pDelTsReq, peerMacAddr, psessionEntry)) {
- PELOGE(lim_log(pMac, LOGE, FL("lim_validate_delts_req failed"));)
+ lim_log(pMac, LOGE, FL("lim_validate_delts_req failed"));
goto error2;
}
- PELOG1(lim_log(pMac, LOG1, "Sent DELTS request to station with "
+ lim_log(pMac, LOGD, "Sent DELTS request to station with "
"assocId = %d MacAddr = " MAC_ADDRESS_STR,
pDelTsReq->aid, MAC_ADDR_ARRAY(peerMacAddr));
- )
lim_send_delts_req_action_frame(pMac, peerMacAddr,
pDelTsReq->req.wmeTspecPresent,
@@ -5068,7 +5002,7 @@ void lim_process_del_ts_ind(tpAniSirGlobal pMac, tpSirMsgQ limMsg)
/* prepare and send an sme indication to HDD */
pDelTsReqInfo = qdf_mem_malloc(sizeof(tSirDeltsReqInfo));
if (NULL == pDelTsReqInfo) {
- PELOGE(lim_log(pMac, LOGE, FL("AllocateMemory() failed"));)
+ lim_log(pMac, LOGE, FL("AllocateMemory() failed"));
goto error3;
}
@@ -5222,10 +5156,8 @@ tAniBool lim_is_channel_valid_for_channel_switch(tpAniSirGlobal pMac, uint8_t ch
(uint8_t *) validChannelList,
(uint32_t *) &validChannelListLen) !=
eSIR_SUCCESS) {
- PELOGE(lim_log
- (pMac, LOGE,
- FL("could not retrieve valid channel list"));
- )
+ lim_log(pMac, LOGE,
+ FL("could not retrieve valid channel list"));
return eSIR_FALSE;
}
@@ -5281,7 +5213,7 @@ __lim_fill_tx_control_params(tpAniSirGlobal pMac, tpTxControlParams pTxCtrlMsg,
case eLIM_TX_BSS:
/* Fall thru... */
default:
- PELOGW(lim_log(pMac, LOGW, FL("Invalid case: Not Handled"));)
+ lim_log(pMac, LOGW, FL("Invalid case: Not Handled"));
return QDF_STATUS_E_FAILURE;
}
@@ -5346,19 +5278,9 @@ void lim_frame_transmission_control(tpAniSirGlobal pMac, tLimQuietTxMode type,
return;
}
- if (mode == eLIM_STOP_TX) {
- PELOG1(lim_log
- (pMac, LOG1,
- FL
- ("Stopping the transmission of all packets, indicated softmac"));
- )
- } else {
- PELOG1(lim_log
- (pMac, LOG1,
- FL
- ("Resuming the transmission of all packets, indicated softmac"));
- )
- }
+ lim_log(pMac, LOGD,
+ FL("Stopping the transmission of all packets, indicated softmac tx_control: %d,"),
+ mode);
return;
}
@@ -5454,10 +5376,8 @@ lim_prepare_for11h_channel_switch(tpAniSirGlobal pMac, tpPESession psessionEntry
if (pMac->lim.gLimSmeState == eLIM_SME_LINK_EST_WT_SCAN_STATE ||
pMac->lim.gLimSmeState == eLIM_SME_CHANNEL_SCAN_STATE) {
- PELOGE(lim_log
- (pMac, LOG1,
- FL("Posting finish scan as we are in scan state"));
- )
+ lim_log(pMac, LOGD,
+ FL("Posting finish scan as we are in scan state"));
/* Stop ongoing scanning if any */
if (GET_LIM_PROCESS_DEFD_MESGS(pMac)) {
/* Set the resume channel to Any valid channel (invalid). */
@@ -5468,10 +5388,8 @@ lim_prepare_for11h_channel_switch(tpAniSirGlobal pMac, tpPESession psessionEntry
}
return;
} else {
- PELOGE(lim_log
- (pMac, LOG1,
- FL("Not in scan state, start channel switch timer"));
- )
+ lim_log(pMac, LOGD,
+ FL("Not in scan state, start channel switch timer"));
/** We are safe to switch channel at this point */
lim_stop_tx_and_switch_channel(pMac, psessionEntry->peSessionId);
}
@@ -5557,10 +5475,8 @@ void lim_set_tspec_uapsd_mask_per_session(tpAniSirGlobal pMac,
uint16_t direction = pTsInfo->traffic.direction;
uint8_t ac = upToAc(userPrio);
- PELOG1(lim_log
- (pMac, LOG1, FL("Set UAPSD mask for AC %d, dir %d, action=%d")
- , ac, direction, action);
- )
+ lim_log(pMac, LOGD, FL("Set UAPSD mask for AC %d, dir %d, action=%d")
+ , ac, direction, action);
/* Converting AC to appropriate Uapsd Bit Mask
* AC_BE(0) --> UAPSD_BITOFFSET_ACVO(3)
@@ -5598,11 +5514,9 @@ void lim_set_tspec_uapsd_mask_per_session(tpAniSirGlobal pMac,
}
}
- lim_log(pMac, LOG1,
- FL("New psessionEntry->gUapsdPerAcTriggerEnableMask = 0x%x "),
- psessionEntry->gUapsdPerAcTriggerEnableMask);
- lim_log(pMac, LOG1,
- FL("New psessionEntry->gUapsdPerAcDeliveryEnableMask = 0x%x "),
+ lim_log(pMac, LOGD,
+ FL("New session entry for UAPSD, trigger=0x%x, delivery=0x%x"),
+ psessionEntry->gUapsdPerAcTriggerEnableMask,
psessionEntry->gUapsdPerAcDeliveryEnableMask);
return;
@@ -5642,9 +5556,8 @@ void lim_handle_heart_beat_timeout_for_session(tpAniSirGlobal mac_ctx,
* Activate Probe After HeartBeat Timer incase HB
* Failure detected
*/
- PELOGW(lim_log(mac_ctx, LOGW,
- FL("Sending Probe for Session: %d"),
- psession_entry->bssIdx);)
+ lim_log(mac_ctx, LOGD, FL("Sending Probe for Session: %d"),
+ psession_entry->bssIdx);
lim_deactivate_and_change_timer(mac_ctx,
eLIM_PROBE_AFTER_HB_TIMER);
MTRACE(mac_trace(mac_ctx, TRACE_CODE_TIMER_ACTIVATE, 0,
@@ -5690,7 +5603,7 @@ void lim_process_add_sta_rsp(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
session = pe_find_session_by_session_id(mac_ctx,
add_sta_params->sessionId);
if (session == NULL) {
- lim_log(mac_ctx, LOGP,
+ lim_log(mac_ctx, LOGE,
FL("Session Does not exist for given sessionID"));
qdf_mem_free(add_sta_params);
return;
@@ -6105,7 +6018,7 @@ void lim_pmf_sa_query_timer_handler(void *pMacGlobal, uint32_t param)
tpDphHashNode pSta;
uint32_t maxRetries;
- lim_log(pMac, LOG1, FL("SA Query timer fires"));
+ lim_log(pMac, LOGD, FL("SA Query timer fires"));
timerId.value = param;
/* Check that SA Query is in progress */
@@ -6256,7 +6169,7 @@ void lim_get_short_slot_from_phy_mode(tpAniSirGlobal pMac, tpPESession psessionE
val = false;
}
- lim_log(pMac, LOG1, FL("phyMode = %u shortslotsupported = %u"), phyMode,
+ lim_log(pMac, LOGD, FL("phyMode = %u shortslotsupported = %u"), phyMode,
val);
*pShortSlotEnabled = val;
}
@@ -6530,7 +6443,7 @@ void lim_set_stads_rtt_cap(tpDphHashNode sta_ds, struct s_ext_cap *ext_cap,
RTT_FINE_TIME_MEAS_RESPONDER_CAPABILITY :
RTT_INVALID;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("ExtCap present, timingMeas: %d Initiator: %d Responder: %d"),
ext_cap->timing_meas, ext_cap->fine_time_meas_initiator,
ext_cap->fine_time_meas_responder);
@@ -6743,11 +6656,11 @@ QDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx,
vdev_ie->length = num_bytes;
vdev_ie->band = 0;
- lim_log(mac_ctx, LOG1, FL("vdev %d ieid %d len %d"), session_id,
+ lim_log(mac_ctx, LOGD, FL("vdev %d ieid %d len %d"), session_id,
DOT11F_EID_EXTCAP, num_bytes);
temp = ext_cap_data.bytes;
for (i = 0; i < num_bytes; i++, temp++)
- lim_log(mac_ctx, LOG1, FL("%d byte is %02x"), i+1, *temp);
+ lim_log(mac_ctx, LOGD, FL("%d byte is %02x"), i+1, *temp);
vdev_ie->data = (uint8_t *)vdev_ie + sizeof(*vdev_ie);
qdf_mem_copy(vdev_ie->data, ext_cap_data.bytes, num_bytes);
@@ -6797,7 +6710,7 @@ tSirRetStatus lim_strip_ie(tpAniSirGlobal mac_ctx,
uint16_t elem_len;
if (NULL == addn_ie) {
- lim_log(mac_ctx, LOG1, FL("NULL addn_ie pointer"));
+ lim_log(mac_ctx, LOGD, FL("NULL addn_ie pointer"));
return eSIR_IGNORE_IE;
}
@@ -6872,7 +6785,7 @@ tSirRetStatus lim_strip_supp_op_class_update_struct(tpAniSirGlobal mac_ctx,
NULL, 0, extracted_buff,
DOT11F_IE_SUPPOPERATINGCLASSES_MAX_LEN);
if (eSIR_SUCCESS != status) {
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Failed to strip supp_op_mode IE status = (%d)."),
status);
return status;
@@ -6880,7 +6793,7 @@ tSirRetStatus lim_strip_supp_op_class_update_struct(tpAniSirGlobal mac_ctx,
if (DOT11F_EID_SUPPOPERATINGCLASSES != extracted_buff[0] ||
extracted_buff[1] > DOT11F_IE_SUPPOPERATINGCLASSES_MAX_LEN) {
- lim_log(mac_ctx, LOG1, FL("Invalid IEs eid = %d elem_len=%d "),
+ lim_log(mac_ctx, LOGD, FL("Invalid IEs eid = %d elem_len=%d "),
extracted_buff[0], extracted_buff[1]);
return eSIR_FAILURE;
}
@@ -6922,7 +6835,7 @@ void lim_update_extcap_struct(tpAniSirGlobal mac_ctx,
}
if (DOT11F_EID_EXTCAP != buf[0] || buf[1] > DOT11F_IE_EXTCAP_MAX_LEN) {
- lim_log(mac_ctx, LOG1, FL("Invalid IEs eid = %d elem_len=%d "),
+ lim_log(mac_ctx, LOGD, FL("Invalid IEs eid = %d elem_len=%d "),
buf[0], buf[1]);
return;
}
@@ -6961,7 +6874,7 @@ tSirRetStatus lim_strip_extcap_update_struct(tpAniSirGlobal mac_ctx,
NULL, 0, extracted_buff,
DOT11F_IE_EXTCAP_MAX_LEN);
if (eSIR_SUCCESS != status) {
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Failed to strip extcap IE status = (%d)."), status);
return status;
}
@@ -7305,17 +7218,20 @@ void lim_update_caps_info_for_bss(tpAniSirGlobal mac_ctx,
{
if (!(bss_caps & LIM_SPECTRUM_MANAGEMENT_BIT_MASK)) {
*caps &= (~LIM_SPECTRUM_MANAGEMENT_BIT_MASK);
- lim_log(mac_ctx, LOG1, FL("Clearing spectrum management:no AP support"));
+ lim_log(mac_ctx, LOGD,
+ FL("Clearing spectrum management:no AP support"));
}
if (!(bss_caps & LIM_SHORT_PREAMBLE_BIT_MASK)) {
*caps &= (~LIM_SHORT_PREAMBLE_BIT_MASK);
- lim_log(mac_ctx, LOG1, FL("Clearing short preamble:no AP support"));
+ lim_log(mac_ctx, LOGD,
+ FL("Clearing short preamble:no AP support"));
}
if (!(bss_caps & LIM_IMMEDIATE_BLOCK_ACK_MASK)) {
*caps &= (~LIM_IMMEDIATE_BLOCK_ACK_MASK);
- lim_log(mac_ctx, LOG1, FL("Clearing Immed Blk Ack:no AP support"));
+ lim_log(mac_ctx, LOGD,
+ FL("Clearing Immed Blk Ack:no AP support"));
}
}
/**
@@ -7349,7 +7265,7 @@ void lim_send_set_dtim_period(tpAniSirGlobal mac_ctx, uint8_t dtim_period,
msg.type = WMA_SET_DTIM_PERIOD;
msg.bodyptr = dtim_params;
msg.bodyval = 0;
- lim_log(mac_ctx, LOG1, FL("Post WMA_SET_DTIM_PERIOD to WMA"));
+ lim_log(mac_ctx, LOGD, FL("Post WMA_SET_DTIM_PERIOD to WMA"));
ret = wma_post_ctrl_msg(mac_ctx, &msg);
if (eSIR_SUCCESS != ret) {
lim_log(mac_ctx, LOGE, FL("wma_post_ctrl_msg() failed"));
diff --git a/core/mac/src/pe/sch/sch_beacon_process.c b/core/mac/src/pe/sch/sch_beacon_process.c
index 23bd6d50897d..2e099115f45d 100644
--- a/core/mac/src/pe/sch/sch_beacon_process.c
+++ b/core/mac/src/pe/sch/sch_beacon_process.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -410,9 +410,9 @@ sch_bcn_process_sta(tpAniSirGlobal mac_ctx,
/* Read beacon interval session Entry */
bi = session->beaconParams.beaconInterval;
if (bi != bcn->beaconInterval) {
- PELOG1(sch_log(mac_ctx, LOG1,
+ sch_log(mac_ctx, LOGD,
FL("Beacon interval changed from %d to %d"),
- bcn->beaconInterval, bi);)
+ bcn->beaconInterval, bi);
bi = bcn->beaconInterval;
session->beaconParams.beaconInterval = (uint16_t) bi;
@@ -801,7 +801,7 @@ static void __sch_beacon_process_for_session(tpAniSirGlobal mac_ctx,
if (mac_ctx->roam.configParam.allow_tpc_from_ap) {
get_local_power_constraint_beacon(bcn, &local_constraint);
- sch_log(mac_ctx, LOG1, "ESE localPowerConstraint = %d,",
+ sch_log(mac_ctx, LOGD, "ESE localPowerConstraint = %d,",
local_constraint);
if (mac_ctx->rrm.rrmPEContext.rrmEnable &&
@@ -809,7 +809,7 @@ static void __sch_beacon_process_for_session(tpAniSirGlobal mac_ctx,
local_constraint = regMax;
local_constraint -=
bcn->localPowerConstraint.localPowerConstraints;
- sch_log(mac_ctx, LOG1, "localPowerConstraint = %d,",
+ sch_log(mac_ctx, LOGD, "localPowerConstraint = %d,",
local_constraint);
}
}
@@ -817,13 +817,13 @@ static void __sch_beacon_process_for_session(tpAniSirGlobal mac_ctx,
maxTxPower = lim_get_max_tx_power(regMax, local_constraint,
mac_ctx->roam.configParam.nTxPowerCap);
- sch_log(mac_ctx, LOG1, "RegMax = %d, MaxTx pwr = %d",
+ sch_log(mac_ctx, LOGD, "RegMax = %d, MaxTx pwr = %d",
regMax, maxTxPower);
/* If maxTxPower is increased or decreased */
if (maxTxPower != session->maxTxPower) {
- sch_log(mac_ctx, LOG1,
+ sch_log(mac_ctx, LOGD,
FL("Local power constraint change, Updating new maxTx power %d from old pwr %d"),
maxTxPower, session->maxTxPower);
if (lim_send_set_max_tx_power_req(mac_ctx, maxTxPower, session)
@@ -926,12 +926,12 @@ sch_beacon_process(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
&& bcn_prm.paramChangeBitmap) {
/* Update the bcn and apply the new settings to HAL */
sch_set_fixed_beacon_fields(mac_ctx, ap_session);
- PELOG1(sch_log(mac_ctx, LOG1,
+ sch_log(mac_ctx, LOGD,
FL("Beacon for PE session[%d] got changed."),
- ap_session->peSessionId);)
- PELOG1(sch_log(mac_ctx, LOG1,
+ ap_session->peSessionId);
+ sch_log(mac_ctx, LOGD,
FL("sending beacon param change bitmap: 0x%x"),
- bcn_prm.paramChangeBitmap);)
+ bcn_prm.paramChangeBitmap);
lim_send_beacon_params(mac_ctx, &bcn_prm, ap_session);
}
}
@@ -966,7 +966,7 @@ sch_beacon_edca_process(tpAniSirGlobal pMac, tSirMacEdcaParamSetIE *edca,
host_log_qos_edca_pkt_type *log_ptr = NULL;
#endif /* FEATURE_WLAN_DIAG_SUPPORT */
- sch_log(pMac, LOG2,
+ sch_log(pMac, LOGD,
FL("Updating parameter set count: Old %d ---> new %d"),
session->gLimEdcaParamSetCount, edca->qosInfo.count);
@@ -1038,11 +1038,11 @@ sch_beacon_edca_process(tpAniSirGlobal pMac, tSirMacEdcaParamSetIE *edca,
}
WLAN_HOST_DIAG_LOG_REPORT(log_ptr);
#endif /* FEATURE_WLAN_DIAG_SUPPORT */
- sch_log(pMac, LOG1,
+ sch_log(pMac, LOGD,
FL("Edsa param enabled in ini %d. Updating Local EDCA Params(gLimEdcaParams) to: "),
pMac->roam.configParam.enable_edca_params);
for (i = 0; i < MAX_NUM_AC; i++) {
- sch_log(pMac, LOG1,
+ sch_log(pMac, LOGD,
FL("AC[%d]: AIFSN: %d, ACM %d, CWmin %d, CWmax %d, TxOp %d"),
i, session->gLimEdcaParams[i].aci.aifsn,
session->gLimEdcaParams[i].aci.acm,
diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c
index fb2865db813f..b078e4867c95 100644
--- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c
+++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c
@@ -94,23 +94,23 @@ void swap_bit_field16(uint16_t in, uint16_t *out)
static inline void __print_wmm_params(tpAniSirGlobal pMac,
tDot11fIEWMMParams *pWmm)
{
- lim_log(pMac, LOG1, FL("WMM Parameters Received:"));
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD, FL("WMM Parameters Received:"));
+ lim_log(pMac, LOGD,
FL("BE: aifsn %d, acm %d, aci %d, cwmin %d, cwmax %d, txop %d"),
pWmm->acbe_aifsn, pWmm->acbe_acm, pWmm->acbe_aci,
pWmm->acbe_acwmin, pWmm->acbe_acwmax, pWmm->acbe_txoplimit);
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("BK: aifsn %d, acm %d, aci %d, cwmin %d, cwmax %d, txop %d"),
pWmm->acbk_aifsn, pWmm->acbk_acm, pWmm->acbk_aci,
pWmm->acbk_acwmin, pWmm->acbk_acwmax, pWmm->acbk_txoplimit);
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("VI: aifsn %d, acm %d, aci %d, cwmin %d, cwmax %d, txop %d"),
pWmm->acvi_aifsn, pWmm->acvi_acm, pWmm->acvi_aci,
pWmm->acvi_acwmin, pWmm->acvi_acwmax, pWmm->acvi_txoplimit);
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("VO: aifsn %d, acm %d, aci %d, cwmin %d, cwmax %d, txop %d"),
pWmm->acvo_aifsn, pWmm->acvo_acm, pWmm->acvo_aci,
pWmm->acvo_acwmin, pWmm->acvo_acwmax, pWmm->acvo_txoplimit);
@@ -223,7 +223,7 @@ void populate_dot_11_f_ext_chann_switch_ann(tpAniSirGlobal mac_ptr,
session_entry->gLimChannelSwitch.switchCount;
dot_11_ptr->present = 1;
- dot11f_log(mac_ptr, LOG1,
+ dot11f_log(mac_ptr, LOGD,
FL("country:%s chan:%d width:%d reg:%d off:%d"),
mac_ptr->scan.countryCodeCurrent,
session_entry->gLimChannelSwitch.primaryChannel,
@@ -751,7 +751,7 @@ populate_dot11f_ht_caps(tpAniSirGlobal pMac,
LIM_IS_STA_ROLE(psessionEntry) &&
(psessionEntry->enableHtSmps) &&
(!psessionEntry->supported_nss_1x1)) {
- lim_log(pMac, LOG1, FL("Add SM power save IE: %d"),
+ lim_log(pMac, LOGD, FL("Add SM power save IE: %d"),
psessionEntry->htSmpsvalue);
pDot11f->mimoPowerSave = psessionEntry->htSmpsvalue;
}
@@ -814,47 +814,47 @@ populate_dot11f_ht_caps(tpAniSirGlobal pMac,
void lim_log_vht_cap(tpAniSirGlobal pMac, tDot11fIEVHTCaps *pDot11f)
{
#ifdef DUMP_MGMT_CNTNTS
- lim_log(pMac, LOG1, FL("maxMPDULen (2): %d"), pDot11f->maxMPDULen);
- lim_log(pMac, LOG1, FL("supportedChannelWidthSet (2): %d"),
+ lim_log(pMac, LOGD, FL("maxMPDULen (2): %d"), pDot11f->maxMPDULen);
+ lim_log(pMac, LOGD, FL("supportedChannelWidthSet (2): %d"),
pDot11f->supportedChannelWidthSet);
- lim_log(pMac, LOG1, FL("ldpcCodingCap (1): %d"),
+ lim_log(pMac, LOGD, FL("ldpcCodingCap (1): %d"),
pDot11f->ldpcCodingCap);
- lim_log(pMac, LOG1, FL("shortGI80MHz (1): %d"), pDot11f->shortGI80MHz);
- lim_log(pMac, LOG1, FL("shortGI160and80plus80MHz (1): %d"),
+ lim_log(pMac, LOGD, FL("shortGI80MHz (1): %d"), pDot11f->shortGI80MHz);
+ lim_log(pMac, LOGD, FL("shortGI160and80plus80MHz (1): %d"),
pDot11f->shortGI160and80plus80MHz);
- lim_log(pMac, LOG1, FL("txSTBC (1): %d"), pDot11f->txSTBC);
- lim_log(pMac, LOG1, FL("rxSTBC (3): %d"), pDot11f->rxSTBC);
- lim_log(pMac, LOG1, FL("suBeamFormerCap (1): %d"),
+ lim_log(pMac, LOGD, FL("txSTBC (1): %d"), pDot11f->txSTBC);
+ lim_log(pMac, LOGD, FL("rxSTBC (3): %d"), pDot11f->rxSTBC);
+ lim_log(pMac, LOGD, FL("suBeamFormerCap (1): %d"),
pDot11f->suBeamFormerCap);
- lim_log(pMac, LOG1, FL("suBeamformeeCap (1): %d"),
+ lim_log(pMac, LOGD, FL("suBeamformeeCap (1): %d"),
pDot11f->suBeamformeeCap);
- lim_log(pMac, LOG1, FL("csnofBeamformerAntSup (3): %d"),
+ lim_log(pMac, LOGD, FL("csnofBeamformerAntSup (3): %d"),
pDot11f->csnofBeamformerAntSup);
- lim_log(pMac, LOG1, FL("numSoundingDim (3): %d"),
+ lim_log(pMac, LOGD, FL("numSoundingDim (3): %d"),
pDot11f->numSoundingDim);
- lim_log(pMac, LOG1, FL("muBeamformerCap (1): %d"),
+ lim_log(pMac, LOGD, FL("muBeamformerCap (1): %d"),
pDot11f->muBeamformerCap);
- lim_log(pMac, LOG1, FL("muBeamformeeCap (1): %d"),
+ lim_log(pMac, LOGD, FL("muBeamformeeCap (1): %d"),
pDot11f->muBeamformeeCap);
- lim_log(pMac, LOG1, FL("vhtTXOPPS (1): %d"), pDot11f->vhtTXOPPS);
- lim_log(pMac, LOG1, FL("htcVHTCap (1): %d"), pDot11f->htcVHTCap);
- lim_log(pMac, LOG1, FL("maxAMPDULenExp (3): %d"),
+ lim_log(pMac, LOGD, FL("vhtTXOPPS (1): %d"), pDot11f->vhtTXOPPS);
+ lim_log(pMac, LOGD, FL("htcVHTCap (1): %d"), pDot11f->htcVHTCap);
+ lim_log(pMac, LOGD, FL("maxAMPDULenExp (3): %d"),
pDot11f->maxAMPDULenExp);
- lim_log(pMac, LOG1, FL("vhtLinkAdaptCap (2): %d"),
+ lim_log(pMac, LOGD, FL("vhtLinkAdaptCap (2): %d"),
pDot11f->vhtLinkAdaptCap);
- lim_log(pMac, LOG1, FL("rxAntPattern (1): %d"),
+ lim_log(pMac, LOGD, FL("rxAntPattern (1): %d"),
pDot11f->rxAntPattern);
- lim_log(pMac, LOG1, FL("txAntPattern (1): %d"),
+ lim_log(pMac, LOGD, FL("txAntPattern (1): %d"),
pDot11f->txAntPattern);
- lim_log(pMac, LOG1, FL("reserved1 (2): %d"), pDot11f->reserved1);
- lim_log(pMac, LOG1, FL("rxMCSMap (16): %d"), pDot11f->rxMCSMap);
- lim_log(pMac, LOG1, FL("rxHighSupDataRate (13): %d"),
+ lim_log(pMac, LOGD, FL("reserved1 (2): %d"), pDot11f->reserved1);
+ lim_log(pMac, LOGD, FL("rxMCSMap (16): %d"), pDot11f->rxMCSMap);
+ lim_log(pMac, LOGD, FL("rxHighSupDataRate (13): %d"),
pDot11f->rxHighSupDataRate);
- lim_log(pMac, LOG1, FL("reserved2(3): %d"), pDot11f->reserved2);
- lim_log(pMac, LOG1, FL("txMCSMap (16): %d"), pDot11f->txMCSMap);
- lim_log(pMac, LOG1, FL("txSupDataRate (13): %d"),
+ lim_log(pMac, LOGD, FL("reserved2(3): %d"), pDot11f->reserved2);
+ lim_log(pMac, LOGD, FL("txMCSMap (16): %d"), pDot11f->txMCSMap);
+ lim_log(pMac, LOGD, FL("txSupDataRate (13): %d"),
pDot11f->txSupDataRate);
- lim_log(pMac, LOG1, FL("reserved3 (3): %d"), pDot11f->reserved3);
+ lim_log(pMac, LOGD, FL("reserved3 (3): %d"), pDot11f->reserved3);
#endif /* DUMP_MGMT_CNTNTS */
}
@@ -862,12 +862,12 @@ static void lim_log_vht_operation(tpAniSirGlobal pMac,
tDot11fIEVHTOperation *pDot11f)
{
#ifdef DUMP_MGMT_CNTNTS
- lim_log(pMac, LOG1, FL("chanWidth : %d"), pDot11f->chanWidth);
- lim_log(pMac, LOG1, FL("chanCenterFreqSeg1: %d"),
+ lim_log(pMac, LOGD, FL("chanWidth : %d"), pDot11f->chanWidth);
+ lim_log(pMac, LOGD, FL("chanCenterFreqSeg1: %d"),
pDot11f->chanCenterFreqSeg1);
- lim_log(pMac, LOG1, FL("chanCenterFreqSeg2: %d"),
+ lim_log(pMac, LOGD, FL("chanCenterFreqSeg2: %d"),
pDot11f->chanCenterFreqSeg2);
- lim_log(pMac, LOG1, FL("basicMCSSet: %d"), pDot11f->basicMCSSet);
+ lim_log(pMac, LOGD, FL("basicMCSSet: %d"), pDot11f->basicMCSSet);
#endif /* DUMP_MGMT_CNTNTS */
}
@@ -875,12 +875,12 @@ static void lim_log_vht_ext_bss_load(tpAniSirGlobal pMac,
tDot11fIEVHTExtBssLoad *pDot11f)
{
#ifdef DUMP_MGMT_CNTNTS
- lim_log(pMac, LOG1, FL("muMIMOCapStaCount : %d"),
+ lim_log(pMac, LOGD, FL("muMIMOCapStaCount : %d"),
pDot11f->muMIMOCapStaCount);
- lim_log(pMac, LOG1, FL("ssUnderUtil: %d"), pDot11f->ssUnderUtil);
- lim_log(pMac, LOG1, FL("FortyMHzUtil: %d"), pDot11f->FortyMHzUtil);
- lim_log(pMac, LOG1, FL("EightyMHzUtil: %d"), pDot11f->EightyMHzUtil);
- lim_log(pMac, LOG1, FL("OneSixtyMHzUtil: %d"),
+ lim_log(pMac, LOGD, FL("ssUnderUtil: %d"), pDot11f->ssUnderUtil);
+ lim_log(pMac, LOGD, FL("FortyMHzUtil: %d"), pDot11f->FortyMHzUtil);
+ lim_log(pMac, LOGD, FL("EightyMHzUtil: %d"), pDot11f->EightyMHzUtil);
+ lim_log(pMac, LOGD, FL("OneSixtyMHzUtil: %d"),
pDot11f->OneSixtyMHzUtil);
#endif /* DUMP_MGMT_CNTNTS */
}
@@ -889,10 +889,10 @@ static void lim_log_operating_mode(tpAniSirGlobal pMac,
tDot11fIEOperatingMode *pDot11f)
{
#ifdef DUMP_MGMT_CNTNTS
- lim_log(pMac, LOG1, FL("ChanWidth : %d"), pDot11f->chanWidth);
- lim_log(pMac, LOG1, FL("reserved: %d"), pDot11f->reserved);
- lim_log(pMac, LOG1, FL("rxNSS: %d"), pDot11f->rxNSS);
- lim_log(pMac, LOG1, FL("rxNSS Type: %d"), pDot11f->rxNSSType);
+ lim_log(pMac, LOGD, FL("ChanWidth : %d"), pDot11f->chanWidth);
+ lim_log(pMac, LOGD, FL("reserved: %d"), pDot11f->reserved);
+ lim_log(pMac, LOGD, FL("rxNSS: %d"), pDot11f->rxNSS);
+ lim_log(pMac, LOGD, FL("rxNSS Type: %d"), pDot11f->rxNSSType);
#endif /* DUMP_MGMT_CNTNTS */
}
@@ -901,18 +901,18 @@ static void lim_log_qos_map_set(tpAniSirGlobal pMac, tSirQosMapSet *pQosMapSet)
uint8_t i;
if (pQosMapSet->num_dscp_exceptions > QOS_MAP_MAX_EX)
pQosMapSet->num_dscp_exceptions = QOS_MAP_MAX_EX;
- lim_log(pMac, LOG1, FL("num of dscp exceptions : %d"),
+ lim_log(pMac, LOGD, FL("num of dscp exceptions : %d"),
pQosMapSet->num_dscp_exceptions);
for (i = 0; i < pQosMapSet->num_dscp_exceptions; i++) {
- lim_log(pMac, LOG1, FL("dscp value: %d"),
+ lim_log(pMac, LOGD, FL("dscp value: %d"),
pQosMapSet->dscp_exceptions[i][0]);
- lim_log(pMac, LOG1, FL("User priority value: %d"),
+ lim_log(pMac, LOGD, FL("User priority value: %d"),
pQosMapSet->dscp_exceptions[i][1]);
}
for (i = 0; i < 8; i++) {
- lim_log(pMac, LOG1, FL("dscp low for up %d: %d"), i,
+ lim_log(pMac, LOGD, FL("dscp low for up %d: %d"), i,
pQosMapSet->dscp_range[i][0]);
- lim_log(pMac, LOG1, FL("dscp high for up %d: %d"), i,
+ lim_log(pMac, LOGD, FL("dscp high for up %d: %d"), i,
pQosMapSet->dscp_range[i][1]);
}
}
@@ -1210,17 +1210,17 @@ populate_dot11f_ext_cap(tpAniSirGlobal pMac,
pDot11f->present = 1;
if (!psessionEntry) {
- lim_log(pMac, LOG1, FL("11MC - enabled for non-SAP cases"));
+ lim_log(pMac, LOGD, FL("11MC - enabled for non-SAP cases"));
pDot11f->num_bytes = DOT11F_IE_EXTCAP_MAX_LEN;
} else if (psessionEntry->sap_dot11mc) {
- lim_log(pMac, LOG1, FL("11MC support enabled"));
+ lim_log(pMac, LOGD, FL("11MC support enabled"));
pDot11f->num_bytes = DOT11F_IE_EXTCAP_MAX_LEN;
} else {
if (eLIM_AP_ROLE != psessionEntry->limSystemRole) {
- lim_log(pMac, LOG1, FL("11MC support enabled"));
+ lim_log(pMac, LOGD, FL("11MC support enabled"));
pDot11f->num_bytes = DOT11F_IE_EXTCAP_MAX_LEN;
} else {
- lim_log(pMac, LOG1, FL("11MC support disabled"));
+ lim_log(pMac, LOGD, FL("11MC support disabled"));
pDot11f->num_bytes = DOT11F_IE_EXTCAP_MIN_LEN;
}
}
@@ -1314,7 +1314,7 @@ populate_dot11f_ht_info(tpAniSirGlobal pMac,
#endif /* TO SUPPORT BT-AMP */
if (NULL == psessionEntry) {
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGE,
FL("Invalid session entry in populate_dot11f_ht_info()"));
return eSIR_FAILURE;
}
@@ -1330,15 +1330,10 @@ populate_dot11f_ht_info(tpAniSirGlobal pMac,
pHTInfoField1->serviceIntervalGranularity =
pMac->lim.gHTServiceIntervalGranularity;
- if (psessionEntry == NULL) {
- lim_log(pMac, LOG1,
- FL("Keep the value retrieved from cfg for secondary channel offset and recommended Tx Width set"));
- } else {
- pHTInfoField1->secondaryChannelOffset =
+ pHTInfoField1->secondaryChannelOffset =
psessionEntry->htSecondaryChannelOffset;
- pHTInfoField1->recommendedTxWidthSet =
+ pHTInfoField1->recommendedTxWidthSet =
psessionEntry->htRecommendedTxWidthSet;
- }
if ((psessionEntry) && LIM_IS_AP_ROLE(psessionEntry)) {
CFG_GET_INT(nSirStatus, pMac, WNI_CFG_HT_INFO_FIELD2,
@@ -1423,10 +1418,8 @@ populate_dot11f_ibss_params(tpAniSirGlobal pMac,
if (wlan_cfg_get_int(pMac,
WNI_CFG_IBSS_ATIM_WIN_SIZE,
&val) != eSIR_SUCCESS) {
- PELOGE(lim_log
- (pMac, LOGE,
- FL("could not retrieve IBSS ATIM WIN size"));
- )
+ lim_log(pMac, LOGE,
+ FL("could not retrieve IBSS ATIM WIN size"));
}
pDot11f->present = 1;
/* ATIM duration is always set to 0 */
@@ -1574,7 +1567,7 @@ populate_dot11f_rsn(tpAniSirGlobal pMac,
status);
return eSIR_FAILURE;
}
- dot11f_log(pMac, LOG2,
+ dot11f_log(pMac, LOGD,
FL("dot11f_unpack_ie_rsn returned 0x%08x in populate_dot11f_rsn."),
status);
}
@@ -1625,7 +1618,7 @@ populate_dot11f_wapi(tpAniSirGlobal pMac,
status);
return eSIR_FAILURE;
}
- dot11f_log(pMac, LOG2,
+ dot11f_log(pMac, LOGD,
FL("dot11f_unpack_ie_rsn returned 0x%08x in populate_dot11f_wapi."),
status);
}
@@ -1805,7 +1798,7 @@ populate_dot11f_rates_tdls(tpAniSirGlobal p_mac,
* If devices move to 2.4GHz off-channel then they can communicate
* in 11g rates i.e. (6, 9, 12, 18, 24, 36 and 54).
*/
- lim_log(p_mac, LOG1,
+ lim_log(p_mac, LOGD,
FL("Current operating channel %d self_dot11mode = %d"),
curr_oper_channel, self_dot11mode);
@@ -1885,7 +1878,7 @@ populate_dot11f_tpc_report(tpAniSirGlobal pMac,
nSirStatus = lim_get_mgmt_staid(pMac, &staid, psessionEntry);
if (eSIR_SUCCESS != nSirStatus) {
- dot11f_log(pMac, LOG1,
+ dot11f_log(pMac, LOGE,
FL("Failed to get the STAID in Populate Dot11fTPCReport; lim_get_mgmt_staid returned status %d."),
nSirStatus);
return eSIR_FAILURE;
@@ -2204,32 +2197,25 @@ sir_convert_probe_req_frame2_struct(tpAniSirGlobal pMac,
lim_log(pMac, LOGE,
FL("Failed to parse a Probe Request (0x%08x, %d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
return eSIR_FAILURE;
} else if (DOT11F_WARNED(status)) {
lim_log(pMac, LOGW,
FL("There were warnings while unpacking a Probe Request (0x%08x, %d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
}
/* & "transliterate" from a 'tDot11fProbeRequestto' a 'tSirProbeReq'... */
if (!pr.SSID.present) {
- PELOGW(lim_log(pMac, LOGW,
- FL("Mandatory IE SSID not present!"));
- )
+ lim_log(pMac, LOGW, FL("Mandatory IE SSID not present!"));
} else {
pProbeReq->ssidPresent = 1;
convert_ssid(pMac, &pProbeReq->ssId, &pr.SSID);
}
if (!pr.SuppRates.present) {
- PELOGW(lim_log(pMac, LOGW,
- FL("Mandatory IE Supported Rates not present!"));
- )
+ lim_log(pMac, LOGW,
+ FL("Mandatory IE Supported Rates not present!"));
return eSIR_FAILURE;
} else {
pProbeReq->suppRatesPresent = 1;
@@ -2318,7 +2304,7 @@ sir_validate_and_rectify_ies(tpAniSirGlobal mac_ctx,
RSNIE_CAPABILITY_LEN,
DEFAULT_RSNIE_CAP_VAL);
*missing_rsn_bytes = RSNIE_CAPABILITY_LEN;
- lim_log(mac_ctx, LOG1,
+ lim_log(mac_ctx, LOGD,
FL("Added RSN Capability to RSNIE as 0x00 0x00"));
return eSIR_SUCCESS;
}
@@ -2351,18 +2337,14 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac,
lim_log(pMac, LOGE,
FL("Failed to parse a Probe Response (0x%08x, %d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
qdf_mem_free(pr);
return eSIR_FAILURE;
} else if (DOT11F_WARNED(status)) {
lim_log(pMac, LOGW,
FL("There were warnings while unpacking a Probe Response (0x%08x, %d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
}
/* & "transliterate" from a 'tDot11fProbeResponse' to a 'tSirProbeRespBeacon'... */
@@ -2395,19 +2377,16 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac,
pProbeResp->capabilityInfo.immediateBA = pr->Capabilities.immediateBA;
if (!pr->SSID.present) {
- PELOGW(lim_log(pMac, LOGW,
- FL("Mandatory IE SSID not present!"));
- )
+ lim_log(pMac, LOGW,
+ FL("Mandatory IE SSID not present!"));
} else {
pProbeResp->ssidPresent = 1;
convert_ssid(pMac, &pProbeResp->ssId, &pr->SSID);
}
if (!pr->SuppRates.present) {
- PELOGW(lim_log
- (pMac, LOGW,
- FL("Mandatory IE Supported Rates not present!"));
- )
+ lim_log(pMac, LOGW,
+ FL("Mandatory IE Supported Rates not present!"));
} else {
pProbeResp->suppRatesPresent = 1;
convert_supp_rates(pMac, &pProbeResp->supportedRates,
@@ -2513,17 +2492,15 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac,
if (pr->WMMParams.present) {
pProbeResp->wmeEdcaPresent = 1;
convert_wmm_params(pMac, &pProbeResp->edcaParams, &pr->WMMParams);
- PELOG1(lim_log(pMac, LOG1,
- FL("WMM Parameter present in Probe Response Frame!"));
+ lim_log(pMac, LOGD,
+ FL("WMM Parameter present in Probe Response Frame!"));
__print_wmm_params(pMac, &pr->WMMParams);
- )
}
if (pr->WMMInfoAp.present) {
pProbeResp->wmeInfoPresent = 1;
- PELOG1(lim_log(pMac, LOG1,
- FL("WMM Information Element present in Probe Response Frame!"));
- )
+ lim_log(pMac, LOGD,
+ FL("WMM Information Element present in Probe Response Frame!"));
}
if (pr->WMMCaps.present) {
@@ -2544,7 +2521,7 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac,
((pr->MobilityDomain.overDSCap << 0) | (pr->MobilityDomain.
resourceReqCap <<
1));
- lim_log(pMac, LOG2, FL("mdie=%02x%02x%02x"),
+ lim_log(pMac, LOGD, FL("mdie=%02x%02x%02x"),
(unsigned int)pProbeResp->mdie[0],
(unsigned int)pProbeResp->mdie[1],
(unsigned int)pProbeResp->mdie[2]);
@@ -2594,7 +2571,7 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac,
}
/* Update HS 2.0 Information Element */
if (pr->hs20vendor_ie.present) {
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("HS20 Indication Element Present, rel#:%u, id:%u"),
pr->hs20vendor_ie.release_num,
pr->hs20vendor_ie.hs_id_present);
@@ -2658,18 +2635,14 @@ sir_convert_assoc_req_frame2_struct(tpAniSirGlobal pMac,
lim_log(pMac, LOGE,
FL("Failed to parse an Association Request (0x%08x, %d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
qdf_mem_free(ar);
return eSIR_FAILURE;
} else if (DOT11F_WARNED(status)) {
lim_log(pMac, LOGW,
FL("There were warnings while unpacking an Assoication Request (0x%08x, %d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
}
/* & "transliterate" from a 'tDot11fAssocRequest' to a 'tSirAssocReq'... */
@@ -2785,18 +2758,15 @@ sir_convert_assoc_req_frame2_struct(tpAniSirGlobal pMac,
pAssocReq->wsmCapablePresent = 1;
if (!pAssocReq->ssidPresent) {
- PELOG2(lim_log(pMac, LOG2,
- FL("Received Assoc without SSID IE."));
- )
+ lim_log(pMac, LOGD,
+ FL("Received Assoc without SSID IE."));
qdf_mem_free(ar);
return eSIR_FAILURE;
}
if (!pAssocReq->suppRatesPresent && !pAssocReq->extendedRatesPresent) {
- PELOG2(lim_log
- (pMac, LOG2,
- FL("Received Assoc without supp rate IE."));
- )
+ lim_log(pMac, LOGD,
+ FL("Received Assoc without supp rate IE."));
qdf_mem_free(ar);
return eSIR_FAILURE;
}
@@ -2818,7 +2788,7 @@ sir_convert_assoc_req_frame2_struct(tpAniSirGlobal pMac,
qdf_mem_copy(&pAssocReq->ExtCap, &ar->ExtCap,
sizeof(tDot11fIEExtCap));
ext_cap = (struct s_ext_cap *)&pAssocReq->ExtCap.bytes;
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("timingMeas: %d, finetimingMeas Init: %d, Resp: %d"),
ext_cap->timing_meas, ext_cap->fine_time_meas_initiator,
ext_cap->fine_time_meas_responder);
@@ -2833,7 +2803,7 @@ sir_convert_assoc_req_frame2_struct(tpAniSirGlobal pMac,
qdf_mem_copy(&pAssocReq->vendor_vht_ie.VHTCaps,
&ar->vendor_vht_ie.VHTCaps,
sizeof(tDot11fIEVHTCaps));
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("Received Assoc Request with Vendor specific VHT Cap"));
lim_log_vht_cap(pMac, &pAssocReq->VHTCaps);
}
@@ -2862,17 +2832,14 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac,
lim_log(pMac, LOGE,
FL("Failed to parse an Association Response (0x%08x, %d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGE, pFrame, nFrame);
return eSIR_FAILURE;
} else if (DOT11F_WARNED(status)) {
lim_log(pMac, LOGW,
FL("There were warnings while unpacking an Association Response (0x%08x, %d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGW, pFrame,
+ nFrame);
}
/* & "transliterate" from a 'tDot11fAssocResponse' a 'tSirAssocRsp'... */
@@ -2909,10 +2876,8 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac,
if (!ar.SuppRates.present) {
pAssocRsp->suppRatesPresent = 0;
- PELOGW(lim_log
- (pMac, LOGW,
- FL("Mandatory IE Supported Rates not present!"));
- )
+ lim_log(pMac, LOGW,
+ FL("Mandatory IE Supported Rates not present!"));
} else {
pAssocRsp->suppRatesPresent = 1;
convert_supp_rates(pMac, &pAssocRsp->supportedRates,
@@ -2933,18 +2898,18 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac,
if (ar.WMMParams.present) {
pAssocRsp->wmeEdcaPresent = 1;
convert_wmm_params(pMac, &pAssocRsp->edca, &ar.WMMParams);
- lim_log(pMac, LOG1, FL("Received Assoc Resp with WMM Param"));
+ lim_log(pMac, LOGD, FL("Received Assoc Resp with WMM Param"));
__print_wmm_params(pMac, &ar.WMMParams);
}
if (ar.HTCaps.present) {
- lim_log(pMac, LOG1, FL("Received Assoc Resp with HT Cap"));
+ lim_log(pMac, LOGD, FL("Received Assoc Resp with HT Cap"));
qdf_mem_copy(&pAssocRsp->HTCaps, &ar.HTCaps,
sizeof(tDot11fIEHTCaps));
}
if (ar.HTInfo.present) {
- lim_log(pMac, LOG1, FL("Received Assoc Resp with HT Info"));
+ lim_log(pMac, LOGD, FL("Received Assoc Resp with HT Info"));
qdf_mem_copy(&pAssocRsp->HTInfo, &ar.HTInfo,
sizeof(tDot11fIEHTInfo));
}
@@ -2958,14 +2923,14 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac,
((ar.MobilityDomain.overDSCap << 0) | (ar.MobilityDomain.
resourceReqCap <<
1));
- lim_log(pMac, LOG1, FL("new mdie=%02x%02x%02x"),
+ lim_log(pMac, LOGD, FL("new mdie=%02x%02x%02x"),
(unsigned int)pAssocRsp->mdie[0],
(unsigned int)pAssocRsp->mdie[1],
(unsigned int)pAssocRsp->mdie[2]);
}
if (ar.FTInfo.present) {
- lim_log(pMac, LOG1, FL("FT Info present %d %d %d"),
+ lim_log(pMac, LOGD, FL("FT Info present %d %d %d"),
ar.FTInfo.R0KH_ID.num_PMK_R0_ID,
ar.FTInfo.R0KH_ID.present, ar.FTInfo.R1KH_ID.present);
pAssocRsp->ftinfoPresent = 1;
@@ -3007,13 +2972,13 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac,
if (ar.VHTCaps.present) {
qdf_mem_copy(&pAssocRsp->VHTCaps, &ar.VHTCaps,
sizeof(tDot11fIEVHTCaps));
- lim_log(pMac, LOG1, FL("Received Assoc Response with VHT Cap"));
+ lim_log(pMac, LOGD, FL("Received Assoc Response with VHT Cap"));
lim_log_vht_cap(pMac, &pAssocRsp->VHTCaps);
}
if (ar.VHTOperation.present) {
qdf_mem_copy(&pAssocRsp->VHTOperation, &ar.VHTOperation,
sizeof(tDot11fIEVHTOperation));
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("Received Assoc Response with VHT Operation"));
lim_log_vht_operation(pMac, &pAssocRsp->VHTOperation);
}
@@ -3023,7 +2988,7 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac,
qdf_mem_copy(&pAssocRsp->ExtCap, &ar.ExtCap,
sizeof(tDot11fIEExtCap));
ext_cap = (struct s_ext_cap *)&pAssocRsp->ExtCap.bytes;
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("timingMeas: %d, finetimingMeas Init: %d, Resp: %d"),
ext_cap->timing_meas, ext_cap->fine_time_meas_initiator,
ext_cap->fine_time_meas_responder);
@@ -3033,7 +2998,7 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac,
pAssocRsp->QosMapSet.present = 1;
convert_qos_mapset_frame(pMac, &pAssocRsp->QosMapSet,
&ar.QosMapSet);
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("Received Assoc Response with Qos Map Set"));
lim_log_qos_map_set(pMac, &pAssocRsp->QosMapSet);
}
@@ -3052,7 +3017,7 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac,
qdf_mem_copy(&pAssocRsp->vendor_vht_ie.VHTCaps,
&ar.vendor_vht_ie.VHTCaps,
sizeof(tDot11fIEVHTCaps));
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("Received Assoc Response with Vendor specific VHT Cap"));
lim_log_vht_cap(pMac, &pAssocRsp->VHTCaps);
}
@@ -3060,7 +3025,7 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac,
qdf_mem_copy(&pAssocRsp->vendor_vht_ie.VHTOperation,
&ar.vendor_vht_ie.VHTOperation,
sizeof(tDot11fIEVHTOperation));
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("Received Assoc Response with Vendor specific VHT Oper"));
lim_log_vht_operation(pMac, &pAssocRsp->VHTOperation);
}
@@ -3085,17 +3050,13 @@ sir_convert_reassoc_req_frame2_struct(tpAniSirGlobal pMac,
lim_log(pMac, LOGE,
FL("Failed to parse a Re-association Request (0x%08x, %d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
return eSIR_FAILURE;
} else if (DOT11F_WARNED(status)) {
lim_log(pMac, LOGW,
FL("There were warnings while unpacking a Re-association Request (0x%08x, %d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
}
/* & "transliterate" from a 'tDot11fReAssocRequest' to a 'tSirAssocReq'... */
@@ -3187,15 +3148,14 @@ sir_convert_reassoc_req_frame2_struct(tpAniSirGlobal pMac,
pAssocReq->wsmCapablePresent = 1;
if (!pAssocReq->ssidPresent) {
- PELOG2(lim_log(pMac, LOG2,
- FL("Received Assoc without SSID IE."));)
+ lim_log(pMac, LOGD,
+ FL("Received Assoc without SSID IE."));
return eSIR_FAILURE;
}
if (!pAssocReq->suppRatesPresent && !pAssocReq->extendedRatesPresent) {
- PELOG2(lim_log
- (pMac, LOG2,
- FL("Received Assoc without supp rate IE."));)
+ lim_log(pMac, LOGD,
+ FL("Received Assoc without supp rate IE."));
return eSIR_FAILURE;
}
/* Why no call to 'updateAssocReqFromPropCapability' here, like */
@@ -3234,7 +3194,7 @@ sir_convert_reassoc_req_frame2_struct(tpAniSirGlobal pMac,
qdf_mem_copy(&pAssocReq->ExtCap, &ar.ExtCap,
sizeof(tDot11fIEExtCap));
ext_cap = (struct s_ext_cap *)&pAssocReq->ExtCap.bytes;
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("timingMeas: %d, finetimingMeas Init: %d, Resp: %d"),
ext_cap->timing_meas, ext_cap->fine_time_meas_initiator,
ext_cap->fine_time_meas_responder);
@@ -3282,15 +3242,11 @@ sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac,
lim_log(pMac, LOGW,
FL("There were warnings while unpacking Beacon IEs (0x%08x, %d bytes):"),
status, nPayload);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pPayload, nPayload);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pPayload, nPayload);
}
/* & "transliterate" from a 'tDot11fBeaconIEs' to a 'eseBcnReportMandatoryIe'... */
if (!pBies->SSID.present) {
- PELOGW(lim_log(pMac, LOGW,
- FL("Mandatory IE SSID not present!"));
- )
+ lim_log(pMac, LOGW, FL("Mandatory IE SSID not present!"));
} else {
eseBcnReportMandatoryIe.ssidPresent = 1;
convert_ssid(pMac, &eseBcnReportMandatoryIe.ssId, &pBies->SSID);
@@ -3299,8 +3255,8 @@ sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac,
}
if (!pBies->SuppRates.present) {
- PELOGW(lim_log(pMac, LOGW,
- FL("Mandatory IE Supported Rates not present!"));)
+ lim_log(pMac, LOGW,
+ FL("Mandatory IE Supported Rates not present!"));
} else {
eseBcnReportMandatoryIe.suppRatesPresent = 1;
convert_supp_rates(pMac, &eseBcnReportMandatoryIe.supportedRates,
@@ -3571,32 +3527,26 @@ sir_parse_beacon_ie(tpAniSirGlobal pMac,
lim_log(pMac, LOGE,
FL("Failed to parse Beacon IEs (0x%08x, %d bytes):"),
status, nPayload);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pPayload, nPayload);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pPayload, nPayload);
qdf_mem_free(pBies);
return eSIR_FAILURE;
} else if (DOT11F_WARNED(status)) {
lim_log(pMac, LOGW,
FL("There were warnings while unpacking Beacon IEs (0x%08x, %d bytes):"),
status, nPayload);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pPayload, nPayload);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pPayload, nPayload);
}
/* & "transliterate" from a 'tDot11fBeaconIEs' to a 'tSirProbeRespBeacon'... */
if (!pBies->SSID.present) {
- PELOGW(lim_log(pMac, LOGW,
- FL("Mandatory IE SSID not present!"));)
+ lim_log(pMac, LOGW, FL("Mandatory IE SSID not present!"));
} else {
pBeaconStruct->ssidPresent = 1;
convert_ssid(pMac, &pBeaconStruct->ssId, &pBies->SSID);
}
if (!pBies->SuppRates.present) {
- PELOGW(lim_log(pMac, LOGW,
- FL("Mandatory IE Supported Rates not present!"));
- )
+ lim_log(pMac, LOGW,
+ FL("Mandatory IE Supported Rates not present!"));
} else {
pBeaconStruct->suppRatesPresent = 1;
convert_supp_rates(pMac, &pBeaconStruct->supportedRates,
@@ -3799,7 +3749,7 @@ sir_parse_beacon_ie(tpAniSirGlobal pMac,
}
/* Update HS 2.0 Information Element */
if (pBies->hs20vendor_ie.present) {
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("HS20 Indication Element Present, rel#:%u, id:%u"),
pBies->hs20vendor_ie.release_num,
pBies->hs20vendor_ie.hs_id_present);
@@ -3876,18 +3826,14 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac,
lim_log(pMac, LOGE,
FL("Failed to parse Beacon IEs (0x%08x, %d bytes):"),
status, nPayload);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pPayload, nPayload);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pPayload, nPayload);
qdf_mem_free(pBeacon);
return eSIR_FAILURE;
} else if (DOT11F_WARNED(status)) {
lim_log(pMac, LOGW,
FL("There were warnings while unpacking Beacon IEs (0x%08x, %d bytes):"),
status, nPayload);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pPayload, nPayload);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pPayload, nPayload);
}
/* & "transliterate" from a 'tDot11fBeacon' to a 'tSirProbeRespBeacon'... */
/* Timestamp */
@@ -3925,17 +3871,16 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac,
pBeacon->Capabilities.immediateBA;
if (!pBeacon->SSID.present) {
- PELOGW(lim_log(pMac, LOGW,
- FL("Mandatory IE SSID not present!"));)
+ lim_log(pMac, LOGW,
+ FL("Mandatory IE SSID not present!"));
} else {
pBeaconStruct->ssidPresent = 1;
convert_ssid(pMac, &pBeaconStruct->ssId, &pBeacon->SSID);
}
if (!pBeacon->SuppRates.present) {
- PELOGW(lim_log(pMac, LOGW,
- FL("Mandatory IE Supported Rates not present!"));
- )
+ lim_log(pMac, LOGW,
+ FL("Mandatory IE Supported Rates not present!"));
} else {
pBeaconStruct->suppRatesPresent = 1;
convert_supp_rates(pMac, &pBeaconStruct->supportedRates,
@@ -4035,7 +3980,7 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac,
pBeaconStruct->channelNumber = pBeacon->HTInfo.primaryChannel;
} else {
pBeaconStruct->channelNumber = mappedRXCh;
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("Channel info is not present in Beacon"));
}
@@ -4053,17 +3998,15 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac,
pBeaconStruct->wmeEdcaPresent = 1;
convert_wmm_params(pMac, &pBeaconStruct->edcaParams,
&pBeacon->WMMParams);
- PELOG1(lim_log
- (pMac, LOG1,
- FL("WMM Parameter present in Beacon Frame!"));
+ lim_log(pMac, LOGD,
+ FL("WMM Parameter present in Beacon Frame!"));
__print_wmm_params(pMac, &pBeacon->WMMParams);
- )
}
if (pBeacon->WMMInfoAp.present) {
pBeaconStruct->wmeInfoPresent = 1;
- PELOG1(lim_log(pMac, LOG1,
- FL("WMM Info present in Beacon Frame!"));)
+ lim_log(pMac, LOGD,
+ FL("WMM Info present in Beacon Frame!"));
}
if (pBeacon->WMMCaps.present) {
@@ -4146,9 +4089,8 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac,
pBeacon->vendor_vht_ie.sub_type;
}
if (pBeacon->vendor_vht_ie.present) {
- PELOG1(lim_log(pMac, LOG1,
- FL("Vendor Specific VHT caps present in Beacon Frame!"));
- )
+ lim_log(pMac, LOGD,
+ FL("Vendor Specific VHT caps present in Beacon Frame!"));
}
if (pBeacon->vendor_vht_ie.VHTCaps.present) {
qdf_mem_copy(&pBeaconStruct->vendor_vht_ie.VHTCaps,
@@ -4162,7 +4104,7 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac,
}
/* Update HS 2.0 Information Element */
if (pBeacon->hs20vendor_ie.present) {
- lim_log(pMac, LOG1,
+ lim_log(pMac, LOGD,
FL("HS20 Indication Element Present, rel#:%u, id:%u"),
pBeacon->hs20vendor_ie.release_num,
pBeacon->hs20vendor_ie.hs_id_present);
@@ -4236,17 +4178,13 @@ sir_convert_auth_frame2_struct(tpAniSirGlobal pMac,
lim_log(pMac, LOGE,
FL("Failed to parse an Authentication frame (0x%08x, %d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
return eSIR_FAILURE;
} else if (DOT11F_WARNED(status)) {
lim_log(pMac, LOGW,
FL("There were warnings while unpacking an Authentication frame (0x%08x, %d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
}
/* & "transliterate" from a 'tDot11fAuthentication' to a 'tSirMacAuthFrameBody'... */
pAuth->authAlgoNumber = auth.AuthAlgo.algo;
@@ -4307,17 +4245,14 @@ sir_convert_addts_req2_struct(tpAniSirGlobal pMac,
lim_log(pMac, LOGE,
FL("Failed to parse an Add TS Request frame (0x%08x, %d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
return eSIR_FAILURE;
} else if (DOT11F_WARNED(status)) {
lim_log(pMac, LOGW,
FL("There were warnings while unpacking an Add TS Request frame (0x%08x,%d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf
+ (pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
}
/* & "transliterate" from a 'tDot11fAddTSRequest' or a */
/* 'tDot11WMMAddTSRequest' to a 'tSirMacAddtsReqInfo'... */
@@ -4448,17 +4383,13 @@ sir_convert_addts_rsp2_struct(tpAniSirGlobal pMac,
lim_log(pMac, LOGE,
FL("Failed to parse an Add TS Response frame (0x%08x, %d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
return eSIR_FAILURE;
} else if (DOT11F_WARNED(status)) {
lim_log(pMac, LOGW,
FL("There were warnings while unpacking an Add TS Response frame (0x%08x,%d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
}
/* & "transliterate" from a 'tDot11fAddTSResponse' or a */
/* 'tDot11WMMAddTSResponse' to a 'tSirMacAddtsRspInfo'... */
@@ -4623,17 +4554,13 @@ sir_convert_delts_req2_struct(tpAniSirGlobal pMac,
lim_log(pMac, LOGE,
FL("Failed to parse an Del TS Request frame (0x%08x, %d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
return eSIR_FAILURE;
} else if (DOT11F_WARNED(status)) {
dot11f_log(pMac, LOGW,
FL("There were warnings while unpacking an Del TS Request frame (0x%08x,%d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
}
/* & "transliterate" from a 'tDot11fDelTSResponse' or a */
/* 'tDot11WMMDelTSResponse' to a 'tSirMacDeltsReqInfo'... */
@@ -4685,17 +4612,13 @@ sir_convert_qos_map_configure_frame2_struct(tpAniSirGlobal pMac,
dot11f_log(pMac, LOGE,
FL("Failed to parse Qos Map Configure frame (0x%08x, %d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
return eSIR_FAILURE;
} else if (DOT11F_WARNED(status)) {
dot11f_log(pMac, LOGW,
FL("There were warnings while unpacking Qos Map Configure frame (0x%08x, %d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
}
pQosMapSet->present = mapConfigure.QosMapSet.present;
convert_qos_mapset_frame(pMac->hHdd, pQosMapSet, &mapConfigure.QosMapSet);
@@ -4719,17 +4642,13 @@ sir_convert_tpc_req_frame2_struct(tpAniSirGlobal pMac,
dot11f_log(pMac, LOGE,
FL("Failed to parse a TPC Request frame (0x%08x, %d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
return eSIR_FAILURE;
} else if (DOT11F_WARNED(status)) {
dot11f_log(pMac, LOGW,
FL("There were warnings while unpacking a TPC Request frame (0x%08x, %d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
}
/* & "transliterate" from a 'tDot11fTPCRequest' to a */
/* 'tSirMacTpcReqActionFrame'... */
@@ -4764,17 +4683,13 @@ sir_convert_meas_req_frame2_struct(tpAniSirGlobal pMac,
dot11f_log(pMac, LOGE,
FL("Failed to parse a Measurement Request frame (0x%08x, %d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
return eSIR_FAILURE;
} else if (DOT11F_WARNED(status)) {
dot11f_log(pMac, LOGW,
FL("There were warnings while unpacking a Measurement Request frame (0x%08x, %d bytes):"),
status, nFrame);
- PELOG2(sir_dump_buf
- (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);
- )
+ sir_dump_buf(pMac, SIR_DBG_MODULE_ID, LOGD, pFrame, nFrame);
}
/* & "transliterate" from a 'tDot11fMeasurementRequest' to a */
/* 'tpSirMacMeasReqActionFrame'... */
@@ -5779,7 +5694,7 @@ tSirRetStatus populate_dot11f_rrm_ie(tpAniSirGlobal pMac,
pDot11f->reserved = pRrmCaps->reserved;
bytes = (uint8_t *) pDot11f + 1; /* ignore present field */
- lim_log(pMac, LOG1, FL("RRM Enabled Cap IE: %02x %02x %02x %02x %02x"),
+ lim_log(pMac, LOGD, FL("RRM Enabled Cap IE: %02x %02x %02x %02x %02x"),
bytes[0], bytes[1], bytes[2], bytes[3], bytes[4]);
pDot11f->present = 1;
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index d363d49ba3dd..a5b9972b88c5 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -3538,7 +3538,7 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle,
if (0 != first_ap_profile.channelId) {
*ap_chnl_id = first_ap_profile.channelId;
QDF_TRACE(QDF_MODULE_ID_SME,
- QDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE_LEVEL_DEBUG,
FL("Found best AP & its on chnl[%d]"),
first_ap_profile.channelId);
} else {
@@ -8038,13 +8038,12 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId,
(csr_is_conn_state_infra(pMac, sessionId) ||
csr_is_ndi_started(pMac, sessionId))) {
pSession = CSR_GET_SESSION(pMac, sessionId);
- }
-
- if (pSession == NULL) {
- QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN,
- "%s: Unable to find the session Id: %d", __func__,
- sessionId);
- return QDF_STATUS_E_FAILURE;
+ if (pSession == NULL) {
+ QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
+ "%s: Unable to find the session Id: %d", __func__,
+ sessionId);
+ return QDF_STATUS_E_FAILURE;
+ }
}
request_buf = qdf_mem_malloc(sizeof(tSirRcvFltMcAddrList));
@@ -12673,7 +12672,7 @@ QDF_STATUS sme_add_ch_avoid_callback
QDF_STATUS status = QDF_STATUS_SUCCESS;
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
- QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
"%s: Plug in CH AVOID CB", __func__);
status = sme_acquire_global_lock(&pMac->sme);
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 8fc249d9458a..3a928f30f2c1 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -17452,7 +17452,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx,
*/
if (req_buf->HomeAwayTime < (req_buf->NeighborScanChannelMaxTime +
(2 * CSR_ROAM_SCAN_CHANNEL_SWITCH_TIME))) {
- QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN,
+ QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
FL("Invalid config, Home away time(%d) is less than (twice RF switching time + channel max time)(%d). Hence enforcing home away time to disable (0)"),
req_buf->HomeAwayTime,
(req_buf->NeighborScanChannelMaxTime +
@@ -17931,7 +17931,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id,
if ((ROAM_SCAN_OFFLOAD_START == command) &&
(session->pCurRoamProfile &&
session->pCurRoamProfile->do_not_roam)) {
- sms_log(mac_ctx, LOGE,
+ sms_log(mac_ctx, LOGD,
FL("Supplicant disabled driver roaming"));
return QDF_STATUS_E_FAILURE;
}
diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c
index d09e1b3b2490..0f3ba6dd8a75 100644
--- a/core/sme/src/csr/csr_util.c
+++ b/core/sme/src/csr/csr_util.c
@@ -1394,8 +1394,6 @@ uint32_t csr_translate_to_wni_cfg_dot11_mode(tpAniSirGlobal pMac,
switch (csrDot11Mode) {
case eCSR_CFG_DOT11_MODE_AUTO:
- sms_log(pMac, LOGW,
- FL(" Warning: sees eCSR_CFG_DOT11_MODE_AUTO "));
if (IS_FEATURE_SUPPORTED_BY_FW(DOT11AC))
ret = WNI_CFG_DOT11_MODE_11AC;
else
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-20 17:22:01 +0000