summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Kbuild1
-rw-r--r--core/hdd/src/wlan_hdd_cfg80211.c2
-rw-r--r--core/hdd/src/wlan_hdd_wext.c2
-rw-r--r--core/mac/src/pe/lim/lim_assoc_utils.c2
-rw-r--r--core/mac/src/pe/lim/lim_ft.c134
-rw-r--r--core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c4
-rw-r--r--core/mac/src/pe/lim/lim_process_auth_frame.c29
-rw-r--r--core/mac/src/pe/lim/lim_process_message_queue.c2
-rw-r--r--core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c2
-rw-r--r--core/mac/src/pe/lim/lim_process_sme_req_messages.c2
-rw-r--r--core/mac/src/pe/lim/lim_send_management_frames.c11
-rw-r--r--core/mac/src/pe/lim/lim_send_sme_rsp_messages.c6
-rw-r--r--core/mac/src/sys/legacy/src/utils/src/parser_api.c6
-rw-r--r--core/sme/src/common/sme_ft_api.c36
14 files changed, 35 insertions, 204 deletions
diff --git a/Kbuild b/Kbuild
index bc832ba962db..809011a0e326 100644
--- a/Kbuild
+++ b/Kbuild
@@ -865,7 +865,6 @@ CDEFINES := -DANI_LITTLE_BYTE_ENDIAN \
-D__linux__ \
-DHAL_SELF_STA_PER_BSS=1 \
-DWLAN_FEATURE_VOWIFI_11R \
- -DWLAN_FEATURE_VOWIFI_11R_DEBUG \
-DFEATURE_WLAN_WAPI \
-DFEATURE_OEM_DATA_SUPPORT\
-DSOFTAP_CHANNEL_RANGE \
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 2acbd95d7212..317dd8b486ee 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -10394,10 +10394,8 @@ __wlan_hdd_cfg80211_update_ft_ies(struct wiphy *wiphy,
ftie->ie_len);
hddLog(LOGE, FL("Should be Re-assoc Req IEs"));
}
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
hddLog(LOG1, FL("%s called with Ie of length = %zu"), __func__,
ftie->ie_len);
-#endif
/* Pass the received FT IEs to SME */
sme_set_ft_ies(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId,
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index 73be0e6db036..6128d485ef76 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -8384,10 +8384,8 @@ static int __iw_set_fties(struct net_device *dev, struct iw_request_info *info,
wrqu->data.length);
hddLog(LOGE, FL("Should be Re-assoc Req IEs"));
}
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
hddLog(LOG1, FL("%s called with Ie of length = %d"), __func__,
wrqu->data.length);
-#endif
/* Pass the received FT IEs to SME */
sme_set_ft_ies(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId,
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index 9637e85a07d6..7625e460c84b 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -2816,11 +2816,9 @@ tSirRetStatus lim_add_ft_sta_self(tpAniSirGlobal mac_ctx, uint16_t assoc_id,
msg_q.bodyptr = add_sta_params;
msg_q.bodyval = 0;
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
"Sending WMA_ADD_STA_REQ (aid %d)",
add_sta_params->assocId);
-#endif
MTRACE(mac_trace_msg_tx(mac_ctx, session_entry->peSessionId,
msg_q.type));
diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c
index 542bf777ec92..1cda53dc8294 100644
--- a/core/mac/src/pe/lim/lim_ft.c
+++ b/core/mac/src/pe/lim/lim_ft.c
@@ -74,21 +74,13 @@ void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal pMac, tpPESession psessionEntry
uint8_t sessionId = 0;
if (!psessionEntry) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOGE(lim_log
- (pMac, LOGE, "%s: psessionEntry is NULL", __func__);
- )
-#endif
+ lim_log(pMac, LOGE, FL("psessionEntry is NULL"));
return;
}
/* Nothing to be done if the session is not in STA mode */
if (!LIM_IS_STA_ROLE(psessionEntry)) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOGE(lim_log
- (pMac, LOGE, FL("psessionEntry is not in STA mode"));
- )
-#endif
+ lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode"));
return;
}
@@ -99,11 +91,8 @@ void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal pMac, tpPESession psessionEntry
pFTPreAuthReq->preAuthbssId,
&sessionId);
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOG1(lim_log(pMac, LOG1, FL("Freeing pFTPreAuthReq= %p"),
+ lim_log(pMac, LOG1, FL("Freeing pFTPreAuthReq= %p"),
psessionEntry->ftPEContext.pFTPreAuthReq);
- )
-#endif
if (psessionEntry->ftPEContext.pFTPreAuthReq->
pbssDescription) {
cdf_mem_free(psessionEntry->ftPEContext.pFTPreAuthReq->
@@ -161,28 +150,19 @@ void lim_ft_cleanup_all_ft_sessions(tpAniSirGlobal pMac)
void lim_ft_cleanup(tpAniSirGlobal pMac, tpPESession psessionEntry)
{
if (NULL == psessionEntry) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
PELOGE(lim_log(pMac, LOGE, FL("psessionEntry is NULL"));)
-#endif
return;
}
/* Nothing to be done if the session is not in STA mode */
if (!LIM_IS_STA_ROLE(psessionEntry)) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOGE(lim_log
- (pMac, LOGE, FL("psessionEntry is not in STA mode"));
- )
-#endif
+ lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode"));
return;
}
if (NULL != psessionEntry->ftPEContext.pFTPreAuthReq) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOG1(lim_log(pMac, LOG1, FL("Freeing pFTPreAuthReq= %p"),
+ lim_log(pMac, LOG1, FL("Freeing pFTPreAuthReq= %p"),
psessionEntry->ftPEContext.pFTPreAuthReq);
- )
-#endif
if (NULL !=
psessionEntry->ftPEContext.pFTPreAuthReq->
pbssDescription) {
@@ -231,9 +211,7 @@ int lim_process_ft_pre_auth_req(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
tpSirFTPreAuthReq ft_pre_auth_req = (tSirFTPreAuthReq *) msg->bodyptr;
if (NULL == ft_pre_auth_req) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOGE(lim_log(mac_ctx, LOGE, FL("tSirFTPreAuthReq is NULL"));)
-#endif
+ lim_log(mac_ctx, LOGE, FL("tSirFTPreAuthReq is NULL"));
return buf_consumed;
}
@@ -258,9 +236,7 @@ int lim_process_ft_pre_auth_req(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
/* Nothing to be done if the session is not in STA mode */
if (!LIM_IS_STA_ROLE(session)) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(mac_ctx, LOGE, FL("session is not in STA mode"));
-#endif
buf_consumed = true;
return buf_consumed;
}
@@ -284,12 +260,10 @@ int lim_process_ft_pre_auth_req(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
/* We need information from the Pre-Auth Req. Lets save that */
session->ftPEContext.pFTPreAuthReq = ft_pre_auth_req;
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(mac_ctx, LOG1, FL("PRE Auth ft_ies_length=%02x%02x%02x"),
session->ftPEContext.pFTPreAuthReq->ft_ies[0],
session->ftPEContext.pFTPreAuthReq->ft_ies[1],
session->ftPEContext.pFTPreAuthReq->ft_ies[2]);
-#endif
#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */
lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_PRE_AUTH_REQ_EVENT,
session, 0, 0);
@@ -348,15 +322,11 @@ void lim_perform_ft_pre_auth(tpAniSirGlobal pMac, CDF_STATUS status,
/* Nothing to be done if the session is not in STA mode */
if (!LIM_IS_STA_ROLE(psessionEntry)) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode"));
-#endif
return;
}
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(pMac, LOG2, "Entered wait auth2 state for FT (old session %p)",
psessionEntry);
-#endif
if (psessionEntry->is11Rconnection) {
/* Now we are on the right channel and need to send out Auth1 and
* receive Auth2
@@ -376,17 +346,13 @@ void lim_perform_ft_pre_auth(tpAniSirGlobal pMac, CDF_STATUS status,
psessionEntry->peSessionId;
if (TX_SUCCESS !=
tx_timer_activate(&pMac->lim.limTimers.gLimFTPreAuthRspTimer)) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(pMac, LOGE, FL("FT Auth Rsp Timer Start Failed"));
-#endif
goto preauth_fail;
}
MTRACE(mac_trace(pMac, TRACE_CODE_TIMER_ACTIVATE,
psessionEntry->peSessionId, eLIM_FT_PREAUTH_RSP_TIMER));
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(pMac, LOG1, FL("FT Auth Rsp Timer Started"));
-#endif
#ifdef FEATURE_WLAN_DIAG_SUPPORT
lim_diag_event_report(pMac, WLAN_PE_DIAG_ROAM_AUTH_START_EVENT,
pMac->lim.pSessionEntry, eSIR_SUCCESS, eSIR_SUCCESS);
@@ -422,11 +388,7 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac,
/* Nothing to be done if the session is not in STA mode */
if (!LIM_IS_STA_ROLE(pftSessionEntry)) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOGE(lim_log
- (pMac, LOGE, FL("psessionEntry is not in STA mode"));
- )
-#endif
+ lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode"));
return eSIR_FAILURE;
}
@@ -614,10 +576,8 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac,
}
#endif
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(pMac, LOG1, FL("SIR_HAL_ADD_BSS_REQ with channel = %d..."),
pAddBssParams->currentOperChannel);
-#endif
/* Populate the STA-related parameters here */
/* Note that the STA here refers to the AP */
@@ -786,9 +746,7 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac,
pftSessionEntry->ftPEContext.pAddBssReq = pAddBssParams;
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(pMac, LOG1, FL("Saving SIR_HAL_ADD_BSS_REQ for pre-auth ap..."));
-#endif
cdf_mem_free(pBeaconStruct);
return 0;
@@ -813,15 +771,12 @@ void lim_fill_ft_session(tpAniSirGlobal pMac,
pBeaconStruct = cdf_mem_malloc(sizeof(tSchBeaconStruct));
if (NULL == pBeaconStruct) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(pMac, LOGE,
- FL
- ("Unable to allocate memory for creating lim_fill_ft_session"));
-#endif
+ FL("No memory for creating lim_fill_ft_session"));
return;
}
- /* Retrieve the session that has already been created and update the entry */
+ /* Retrieve the session that was already created and update the entry */
lim_print_mac_addr(pMac, pbssDescription->bssId, LOG1);
pftSessionEntry->limWmeEnabled = psessionEntry->limWmeEnabled;
pftSessionEntry->limQosEnabled = psessionEntry->limQosEnabled;
@@ -989,13 +944,11 @@ void lim_fill_ft_session(tpAniSirGlobal pMac,
pftSessionEntry->maxTxPower = CDF_MIN(regMax, (localPowerConstraint));
#endif
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(pMac, LOG1,
- FL
- ("Reg max = %d, local power = %d, ini tx power = %d, max tx = %d"),
- regMax, localPowerConstraint, pMac->roam.configParam.nTxPowerCap,
+ FL("Reg max=%d, local pwr=%d, ini tx pwr=%d, max tx pwr = %d"),
+ regMax, localPowerConstraint,
+ pMac->roam.configParam.nTxPowerCap,
pftSessionEntry->maxTxPower);
-#endif
if (!psessionEntry->bRoamSynchInProgress) {
pftSessionEntry->limPrevSmeState = pftSessionEntry->limSmeState;
pftSessionEntry->limSmeState = eLIM_SME_WT_REASSOC_STATE;
@@ -1037,11 +990,7 @@ tSirRetStatus lim_ft_setup_auth_session(tpAniSirGlobal pMac,
/* Nothing to be done if the session is not in STA mode */
if (!LIM_IS_STA_ROLE(psessionEntry)) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOGE(lim_log
- (pMac, LOGE, FL("psessionEntry is not in STA mode"));
- )
-#endif
+ lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode"));
return eSIR_FAILURE;
}
@@ -1072,11 +1021,7 @@ void lim_ft_process_pre_auth_result(tpAniSirGlobal pMac, CDF_STATUS status,
/* Nothing to be done if the session is not in STA mode */
if (!LIM_IS_STA_ROLE(psessionEntry)) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOGE(lim_log
- (pMac, LOGE, FL("psessionEntry is not in STA mode"));
- )
-#endif
+ lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode"));
return;
}
@@ -1122,16 +1067,12 @@ void lim_post_ft_pre_auth_rsp(tpAniSirGlobal mac_ctx,
}
cdf_mem_zero(ft_pre_auth_rsp, rsp_len);
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(mac_ctx, LOG1, FL("Auth Rsp = %p"), ft_pre_auth_rsp);
-#endif
if (session) {
/* Nothing to be done if the session is not in STA mode */
if (!LIM_IS_STA_ROLE(session)) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(mac_ctx, LOGE,
FL("session is not in STA mode"));
-#endif
cdf_mem_free(ft_pre_auth_rsp);
return;
}
@@ -1168,10 +1109,8 @@ void lim_post_ft_pre_auth_rsp(tpAniSirGlobal mac_ctx,
mmh_msg.bodyptr = ft_pre_auth_rsp;
mmh_msg.bodyval = 0;
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(mac_ctx, LOG1, FL("Posted Auth Rsp to SME with status of 0x%x"),
status);
-#endif
#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */
if (status == eSIR_SUCCESS)
lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_PREAUTH_DONE,
@@ -1203,11 +1142,7 @@ void lim_handle_ft_pre_auth_rsp(tpAniSirGlobal pMac, tSirRetStatus status,
/* Nothing to be done if the session is not in STA mode */
if (!LIM_IS_STA_ROLE(psessionEntry)) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOGE(lim_log
- (pMac, LOGE, FL("psessionEntry is not in STA mode"));
- )
-#endif
+ lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode"));
return;
}
@@ -1287,13 +1222,10 @@ send_rsp:
psessionEntry->ftPEContext.pFTPreAuthReq->scan_id,
PREAUTH_REQUESTOR_ID);
} else {
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOGE(lim_log(pMac, LOG1,
- "Pre auth on same channel as connected AP channel %d",
- psessionEntry->ftPEContext.pFTPreAuthReq->
- preAuthchannelNum);
- )
-#endif
+ lim_log(pMac, LOG1,
+ "Pre auth on same channel as connected AP channel %d",
+ psessionEntry->ftPEContext.pFTPreAuthReq->
+ preAuthchannelNum);
lim_ft_process_pre_auth_result(pMac, status, psessionEntry);
}
}
@@ -1329,11 +1261,7 @@ void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf,
/* Nothing to be done if the session is not in STA mode */
if (!LIM_IS_STA_ROLE(psessionEntry)) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOGE(lim_log
- (pMac, LOGE, FL("psessionEntry is not in STA mode"));
- )
-#endif
+ lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode"));
return;
}
@@ -1432,9 +1360,7 @@ void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf,
msgQ.bodyptr = psessionEntry->ftPEContext.pAddBssReq;
msgQ.bodyval = 0;
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(pMac, LOG1, FL("Sending SIR_HAL_ADD_BSS_REQ..."));
-#endif
MTRACE(mac_trace_msg_tx(pMac, psessionEntry->peSessionId, msgQ.type));
retCode = wma_post_ctrl_msg(pMac, &msgQ);
if (eSIR_SUCCESS != retCode) {
@@ -1477,9 +1403,7 @@ void lim_process_ft_preauth_rsp_timeout(tpAniSirGlobal mac_ctx)
/* Nothing to be done if the session is not in STA mode */
if (!LIM_IS_STA_ROLE(session)) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(mac_ctx, LOGE, FL("session is not in STA mode"));
-#endif
return;
}
@@ -1558,11 +1482,7 @@ bool lim_process_ft_update_key(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
/* Nothing to be done if the session is not in STA mode */
if (!LIM_IS_STA_ROLE(psessionEntry)) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOGE(lim_log
- (pMac, LOGE, FL("psessionEntry is not in STA mode"));
- )
-#endif
+ lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode"));
return false;
}
@@ -1730,11 +1650,7 @@ void lim_process_ft_aggr_qo_s_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg)
return;
}
if (!LIM_IS_STA_ROLE(psessionEntry)) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOGE(lim_log
- (pMac, LOGE, FL("psessionEntry is not in STA mode"));
- )
-#endif
+ lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode"));
return;
}
for (i = 0; i < HAL_QOS_NUM_AC_MAX; i++) {
@@ -1802,11 +1718,7 @@ tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf
/* Nothing to be done if the session is not in STA mode */
if (!LIM_IS_STA_ROLE(psessionEntry)) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOGE(lim_log
- (pMac, LOGE, FL("psessionEntry is not in STA mode"));
- )
-#endif
+ lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode"));
cdf_mem_free(pAggrAddTsParam);
return eSIR_FAILURE;
}
diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
index 48d438dcfaf8..5d97eaaf05be 100644
--- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
+++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
@@ -653,12 +653,10 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx,
))) {
/* Received unexpected Re/Association Response frame */
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(mac_ctx, LOG1,
FL("Recieved Re/Assoc rsp in unexpected "
"state %d on session=%d"),
session_entry->limMlmState, session_entry->peSessionId);
-#endif
if (!hdr->fc.retry) {
if (!(mac_ctx->lim.retry_packet_cnt & 0xf)) {
lim_log(mac_ctx, LOGE,
@@ -972,9 +970,7 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx,
if ((session_entry->limMlmState ==
eLIM_MLM_WT_FT_REASSOC_RSP_STATE) ||
session_entry->bRoamSynchInProgress) {
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(mac_ctx, LOG1, FL("Sending self sta"));
-#endif
lim_update_assoc_sta_datas(mac_ctx, sta_ds, assoc_rsp,
session_entry);
/* Store assigned AID for TIM processing */
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 1d6de28ef39f..2543a3b9c4e3 100644
--- a/core/mac/src/pe/lim/lim_process_auth_frame.c
+++ b/core/mac/src/pe/lim/lim_process_auth_frame.c
@@ -1428,17 +1428,14 @@ tSirRetStatus lim_process_auth_frame_no_session(tpAniSirGlobal pMac, uint8_t *pB
lim_log(pMac, LOGE, FL("Error: Frame len = 0"));
return eSIR_FAILURE;
}
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_print_mac_addr(pMac, pHdr->bssId, LOG2);
lim_print_mac_addr(pMac,
psessionEntry->ftPEContext.pFTPreAuthReq->preAuthbssId,
LOG2);
lim_log(pMac, LOG2, FL("seqControl 0x%X"),
- ((pHdr->seqControl.seqNumHi << 8) | (pHdr->seqControl.
- seqNumLo << 4) | (pHdr->
- seqControl.
- fragNum)));
-#endif
+ ((pHdr->seqControl.seqNumHi << 8) |
+ (pHdr->seqControl.seqNumLo << 4) |
+ (pHdr->seqControl.fragNum)));
/* Check that its the same bssId we have for preAuth */
if (!cdf_mem_compare
@@ -1483,10 +1480,8 @@ tSirRetStatus lim_process_auth_frame_no_session(tpAniSirGlobal pMac, uint8_t *pB
true;
}
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(pMac, LOG1, FL("Pre-Auth response received from neighbor"));
lim_log(pMac, LOG1, FL("Pre-Auth done state"));
-#endif
/* 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);
@@ -1502,7 +1497,6 @@ tSirRetStatus lim_process_auth_frame_no_session(tpAniSirGlobal pMac, uint8_t *pB
}
pRxAuthFrameBody = &rxAuthFrame;
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
PELOGE(lim_log(pMac, LOG1,
FL
("Received Auth frame with type=%d seqnum=%d, status=%d (%d)"),
@@ -1511,16 +1505,11 @@ tSirRetStatus lim_process_auth_frame_no_session(tpAniSirGlobal pMac, uint8_t *pB
(uint32_t) pRxAuthFrameBody->authStatusCode,
(uint32_t) pMac->lim.gLimNumPreAuthContexts);
)
-#endif
switch (pRxAuthFrameBody->authTransactionSeqNumber) {
case SIR_MAC_AUTH_FRAME_2:
if (pRxAuthFrameBody->authStatusCode != eSIR_MAC_SUCCESS_STATUS) {
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOGE(lim_log
- (pMac, LOGE, "Auth status code received is %d",
- (uint32_t) pRxAuthFrameBody->authStatusCode);
- );
-#endif
+ lim_log(pMac, LOGE, "Auth status code received is %d",
+ (uint32_t) pRxAuthFrameBody->authStatusCode);
if (eSIR_MAC_MAX_ASSOC_STA_REACHED_STATUS ==
pRxAuthFrameBody->authStatusCode)
ret_status = eSIR_LIM_MAX_STA_REACHED_ERROR;
@@ -1530,12 +1519,8 @@ tSirRetStatus lim_process_auth_frame_no_session(tpAniSirGlobal pMac, uint8_t *pB
break;
default:
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOGE(lim_log
- (pMac, LOGE, "Seq. no incorrect expected 2 received %d",
- (uint32_t) pRxAuthFrameBody->authTransactionSeqNumber);
- )
-#endif
+ lim_log(pMac, LOGE, "Seq. no incorrect expected 2 received %d",
+ (uint32_t) pRxAuthFrameBody->authTransactionSeqNumber);
break;
}
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 1158ee3e211c..a8a0d8b2cfe9 100644
--- a/core/mac/src/pe/lim/lim_process_message_queue.c
+++ b/core/mac/src/pe/lim/lim_process_message_queue.c
@@ -815,13 +815,11 @@ lim_handle80211_frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, uint8_t *pDeferMsg
&sessionId)) == NULL) {
#ifdef WLAN_FEATURE_VOWIFI_11R
if (fc.subType == SIR_MAC_MGMT_AUTH) {
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(pMac, LOG1,
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);
-#endif
if (lim_process_auth_frame_no_session
(pMac, pRxPacketInfo,
limMsg->bodyptr) == eSIR_SUCCESS) {
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 fd25d1e2436c..918ed850028e 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
@@ -2984,11 +2984,9 @@ lim_process_sta_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx,
if (CDF_STATUS_SUCCESS == add_bss_params->status) {
if (eLIM_MLM_WT_ADD_BSS_RSP_FT_REASSOC_STATE ==
session_entry->limMlmState) {
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(mac_ctx, LOG1, FL("Mlm=%d %d"),
session_entry->limMlmState,
eLIM_MLM_WT_ADD_BSS_RSP_REASSOC_STATE);
-#endif
lim_process_sta_mlm_add_bss_rsp_ft(mac_ctx, msg,
session_entry);
goto end;
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 5d3cd646c7e7..22b735b91740 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
@@ -3002,11 +3002,9 @@ __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;
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(mac_ctx, LOG1, FL(
"received SETCONTEXT_REQ message sessionId=%d"),
mlm_set_key_req->sessionId);
-#endif
if (((set_context_req->keyMaterial.edType == eSIR_ED_WEP40) ||
(set_context_req->keyMaterial.edType == eSIR_ED_WEP104)) &&
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 2af7e9addc84..9037fb64ac58 100644
--- a/core/mac/src/pe/lim/lim_send_management_frames.c
+++ b/core/mac/src/pe/lim/lim_send_management_frames.c
@@ -1811,7 +1811,6 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
#if defined WLAN_FEATURE_VOWIFI_11R
if (pe_session->pLimJoinReq->is11Rconnection) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
tSirBssDescription *bssdescr;
bssdescr = &pe_session->pLimJoinReq->bssDescription;
@@ -1819,7 +1818,6 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
(unsigned int) bssdescr->mdie[0],
(unsigned int) bssdescr->mdie[1],
(unsigned int) bssdescr->mdie[2]);
-#endif
populate_mdie(mac_ctx, &frm->MobilityDomain,
pe_session->pLimJoinReq->bssDescription.mdie);
} else {
@@ -2269,10 +2267,8 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx,
bytes = payload + sizeof(tSirMacMgmtHdr) + add_ie_len;
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(mac_ctx, LOG1, FL("FT IE Reassoc Req (%d)."),
ft_sme_context->reassoc_ft_ies_length);
-#endif
#if defined WLAN_FEATURE_VOWIFI_11R
if (pe_session->is11Rconnection)
@@ -2349,12 +2345,9 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx,
body++;
}
}
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
- PELOGE(lim_log(mac_ctx, LOG1, FL("Re-assoc Req Frame is: "));
+ lim_log(mac_ctx, LOG1, FL("Re-assoc Req Frame is: "));
sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOG1,
(uint8_t *) frame, (bytes + ft_ies_length));
- )
-#endif
if ((SIR_BAND_5_GHZ ==
lim_get_rf_band(pe_session->currentOperChannel)) ||
(pe_session->pePersona == CDF_P2P_CLIENT_MODE) ||
@@ -2978,13 +2971,11 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx,
session->ftPEContext.
pFTPreAuthReq->ft_ies,
ft_ies_length);
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(mac_ctx, LOG2,
FL("Auth1 Frame FTIE is: "));
sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOG2,
(uint8_t *) body,
ft_ies_length);
-#endif
} else if (NULL != session->ftPEContext.
pFTPreAuthReq->pbssDescription) {
/* MDID attr is 54 */
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 b1c3d36db155..f514619c28ae 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
@@ -272,10 +272,8 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx,
cdf_mem_free(session_entry->beacon);
session_entry->beacon = NULL;
session_entry->bcnLen = 0;
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(mac_ctx, LOG1, FL("Beacon=%d"),
sme_join_rsp->beaconLength);
-#endif
}
if (session_entry->assocReq != NULL) {
sme_join_rsp->assocReqLength =
@@ -287,11 +285,9 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx,
cdf_mem_free(session_entry->assocReq);
session_entry->assocReq = NULL;
session_entry->assocReqLen = 0;
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(mac_ctx,
LOG1, FL("AssocReq=%d"),
sme_join_rsp->assocReqLength);
-#endif
}
if (session_entry->assocRsp != NULL) {
sme_join_rsp->assocRspLength =
@@ -341,10 +337,8 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx,
}
#endif
sme_join_rsp->aid = session_entry->limAID;
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(mac_ctx, LOG1, FL("AssocRsp=%d"),
sme_join_rsp->assocRspLength);
-#endif
sme_join_rsp->vht_channel_width =
session_entry->ch_width;
#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
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 a84ae79348ac..b13fd2971853 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
@@ -2437,12 +2437,10 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac,
((pr->MobilityDomain.overDSCap << 0) | (pr->MobilityDomain.
resourceReqCap <<
1));
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(pMac, LOG2, FL("mdie=%02x%02x%02x\n"),
(unsigned int)pProbeResp->mdie[0],
(unsigned int)pProbeResp->mdie[1],
(unsigned int)pProbeResp->mdie[2]);
-#endif
}
#endif
@@ -2810,20 +2808,16 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac,
((ar.MobilityDomain.overDSCap << 0) | (ar.MobilityDomain.
resourceReqCap <<
1));
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(pMac, LOG1, FL("new mdie=%02x%02x%02x"),
(unsigned int)pAssocRsp->mdie[0],
(unsigned int)pAssocRsp->mdie[1],
(unsigned int)pAssocRsp->mdie[2]);
-#endif
}
if (ar.FTInfo.present) {
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
lim_log(pMac, LOG1, 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);
-#endif
pAssocRsp->ftinfoPresent = 1;
cdf_mem_copy(&pAssocRsp->FTInfo, &ar.FTInfo,
sizeof(tDot11fIEFTInfo));
diff --git a/core/sme/src/common/sme_ft_api.c b/core/sme/src/common/sme_ft_api.c
index ee6e374c4dd7..d9b6657c0bd3 100644
--- a/core/sme/src/common/sme_ft_api.c
+++ b/core/sme/src/common/sme_ft_api.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -165,10 +165,8 @@ void sme_set_ft_ies(tHalHandle hal_ptr, uint32_t session_id,
if (!(CDF_IS_STATUS_SUCCESS(status)))
return;
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
sms_log(mac_ctx, LOG1, "FT IEs Req is received in state %d",
session->ftSmeContext.FTState);
-#endif
/* Global Station FT State */
switch (session->ftSmeContext.FTState) {
@@ -195,10 +193,8 @@ void sme_set_ft_ies(tHalHandle hal_ptr, uint32_t session_id,
ft_ies, ft_ies_length);
session->ftSmeContext.FTState = eFT_AUTH_REQ_READY;
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
sms_log(mac_ctx, LOG1,
FL("ft_ies_length=%d"), ft_ies_length);
-#endif
break;
case eFT_AUTH_COMPLETE:
@@ -210,14 +206,12 @@ void sme_set_ft_ies(tHalHandle hal_ptr, uint32_t session_id,
* pre-auth list. Delete the pre-auth node locally. Set
* your self back to restart pre-auth
*/
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
sms_log(mac_ctx, LOG1,
FL("Preauth done & rcving AUTHREQ in state %d"),
session->ftSmeContext.FTState);
sms_log(mac_ctx, LOG1,
FL("Unhandled reception of FT IES in state %d"),
session->ftSmeContext.FTState);
-#endif
break;
case eFT_REASSOC_REQ_WAIT:
@@ -226,10 +220,8 @@ void sme_set_ft_ies(tHalHandle hal_ptr, uint32_t session_id,
* reassoc req. This is the new FT Roaming in place At
* this juncture we'r ready to start sending Reassoc req
*/
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
sms_log(mac_ctx, LOG1, FL("New Reassoc Req=%p in state %d"),
ft_ies, session->ftSmeContext.FTState);
-#endif
if ((session->ftSmeContext.reassoc_ft_ies) &&
(session->ftSmeContext.reassoc_ft_ies_length)) {
/* Free the one we recvd last from supplicant */
@@ -251,11 +243,9 @@ void sme_set_ft_ies(tHalHandle hal_ptr, uint32_t session_id,
ft_ies, ft_ies_length);
session->ftSmeContext.FTState = eFT_SET_KEY_WAIT;
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
sms_log(mac_ctx, LOG1,
FL("ft_ies_length=%d state=%d"), ft_ies_length,
session->ftSmeContext.FTState);
-#endif
break;
@@ -287,13 +277,11 @@ CDF_STATUS sme_ft_send_update_key_ind(tHalHandle hal, uint32_t session_id,
tSirKeyMaterial *keymaterial = NULL;
tAniEdType ed_type;
tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal);
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
int i = 0;
sms_log(mac_ctx, LOG1, FL("keyLength %d"), ftkey_info->keyLength);
for (i = 0; i < ftkey_info->keyLength; i++)
sms_log(mac_ctx, LOG1, FL("%02x"), ftkey_info->Key[i]);
-#endif
if (ftkey_info->keyLength > CSR_MAX_KEY_LEN) {
sms_log(mac_ctx, LOGE, FL("invalid keyLength %d"),
@@ -405,10 +393,8 @@ CDF_STATUS sme_ft_update_key(tHalHandle hHal, uint32_t sessionId,
if (!(CDF_IS_STATUS_SUCCESS(status))) {
return CDF_STATUS_E_FAILURE;
}
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
sms_log(pMac, LOG1, "sme_ft_update_key is received in state %d",
pSession->ftSmeContext.FTState);
-#endif
/* Global Station FT State */
switch (pSession->ftSmeContext.FTState) {
@@ -431,10 +417,8 @@ CDF_STATUS sme_ft_update_key(tHalHandle hHal, uint32_t sessionId,
}
pSession->ftSmeContext.FTState = eFT_START_READY;
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
sms_log(pMac, LOG1, "%s: state changed to %d status %d",
__func__, pSession->ftSmeContext.FTState, status);
-#endif
break;
default:
@@ -496,9 +480,7 @@ void sme_get_ft_pre_auth_response(tHalHandle hHal, uint32_t sessionId,
pSession->ftSmeContext.FTState = eFT_REASSOC_REQ_WAIT;
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
sms_log(pMac, LOG1, FL(" Filled auth resp = %d"), *ft_ies_length);
-#endif
sme_release_global_lock(&pMac->sme);
return;
}
@@ -542,9 +524,7 @@ void sme_get_rici_es(tHalHandle hHal, uint32_t sessionId, uint8_t *ric_ies,
*ric_ies_length =
pSession->ftSmeContext.psavedFTPreAuthRsp->ric_ies_length;
-#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
sms_log(pMac, LOG1, FL(" Filled ric ies = %d"), *ric_ies_length);
-#endif
sme_release_global_lock(&pMac->sme);
return;
@@ -586,35 +566,27 @@ void sme_ft_reset(tHalHandle hHal, uint32_t sessionId)
pSession = CSR_GET_SESSION(pMac, sessionId);
if (NULL != pSession) {
if (pSession->ftSmeContext.auth_ft_ies != NULL) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
sms_log(pMac, LOG1,
- FL("Freeing FT Auth IE %p and setting to NULL"),
+ FL("Free FT Auth IE %p and set to NULL"),
pSession->ftSmeContext.auth_ft_ies);
-#endif
cdf_mem_free(pSession->ftSmeContext.auth_ft_ies);
pSession->ftSmeContext.auth_ft_ies = NULL;
}
pSession->ftSmeContext.auth_ft_ies_length = 0;
if (pSession->ftSmeContext.reassoc_ft_ies != NULL) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
sms_log(pMac, LOG1,
- FL
- ("Freeing FT Reassoc IE %p and setting to NULL"),
+ FL("Free FT Reassoc IE %p and set to NULL"),
pSession->ftSmeContext.reassoc_ft_ies);
-#endif
cdf_mem_free(pSession->ftSmeContext.reassoc_ft_ies);
pSession->ftSmeContext.reassoc_ft_ies = NULL;
}
pSession->ftSmeContext.reassoc_ft_ies_length = 0;
if (pSession->ftSmeContext.psavedFTPreAuthRsp != NULL) {
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG
sms_log(pMac, LOG1,
- FL
- ("Freeing FtPreAuthRsp %p and setting to NULL"),
+ FL("Free FtPreAuthRsp %p and set to NULL"),
pSession->ftSmeContext.psavedFTPreAuthRsp);
-#endif
cdf_mem_free(pSession->ftSmeContext.psavedFTPreAuthRsp);
pSession->ftSmeContext.psavedFTPreAuthRsp = NULL;
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-05 23:20:17 +0000