qcacld-3.0: Rename statusCode identifier

The Linux Coding Style doesn't allow mixed-case names and
so-called camelcase notation, so rename the statusCode to be
compliant with the coding style.

Change-Id: I98e0af710401a9718bdc1402617253eb970c5861
CRs-Fixed: 2463825

core/hdd/src/wlan_hdd_assoc.c

@@ -3180,9 +3180,8 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 							   assoc_rsp,
 							   assoc_rsp_len,
 							   WLAN_STATUS_SUCCESS,
-							   GFP_KERNEL,
-							   false,
-							   roam_info->statusCode);
+							   GFP_KERNEL, false,
+							   roam_info->status_code);
 				}
 			} else {
 				/*
@@ -3225,7 +3224,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 								   WLAN_STATUS_SUCCESS,
 								   GFP_KERNEL,
 								   false,
-								   roam_info->statusCode);
+								   roam_info->status_code);
 					}
 					cdp_hl_fc_set_td_limit(soc,
 					adapter->vdev_id,
@@ -3363,11 +3362,11 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 		if ((eCSR_ROAM_RESULT_SCAN_FOR_SSID_FAILURE == roam_result) ||
 		   (roam_info &&
 		   ((eSIR_SME_JOIN_TIMEOUT_RESULT_CODE ==
-					roam_info->statusCode) ||
+					roam_info->status_code) ||
 		   (eSIR_SME_AUTH_TIMEOUT_RESULT_CODE ==
-					roam_info->statusCode) ||
+					roam_info->status_code) ||
 		   (eSIR_SME_ASSOC_TIMEOUT_RESULT_CODE ==
-					roam_info->statusCode)))) {
+					roam_info->status_code)))) {
 			wlan_hdd_cfg80211_unlink_bss(adapter,
 				roam_info ?
 				roam_info->bssid.bytes :
@@ -3409,7 +3408,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 					roam_result, roam_status,
 					roam_info->reasonCode);
 				sta_ctx->conn_info.assoc_status_code =
-					roam_info->statusCode;
+					roam_info->status_code;
 			} else {
 				hdd_err("connect failed: for bssid "
 				       QDF_MAC_ADDR_STR
@@ -3433,7 +3432,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 						WLAN_STATUS_ASSOC_DENIED_UNSPEC,
 						GFP_KERNEL,
 						connect_timeout,
-						roam_info->statusCode);
+						roam_info->status_code);
 				else
 					hdd_connect_result(dev,
 						sta_ctx->requested_bssid.bytes,
@@ -3455,7 +3454,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 						WLAN_STATUS_UNSPECIFIED_FAILURE,
 						GFP_KERNEL,
 						connect_timeout,
-						roam_info->statusCode);
+						roam_info->status_code);
 				else
 					hdd_connect_result(dev,
 						sta_ctx->requested_bssid.bytes,

core/hdd/src/wlan_hdd_hostapd.c

@@ -6589,7 +6589,7 @@ void hdd_sap_indicate_disconnect_for_sta(struct hdd_adapter *adapter)
 			reason =
 				eSAP_MAC_INITATED_DISASSOC;
 			sap_event.sapevt.sapStationDisassocCompleteEvent.
-			statusCode =
+			status_code =
 				QDF_STATUS_E_RESOURCES;
 			hdd_hostapd_sap_event_cb(&sap_event,
 					sap_ctx->user_context);

core/mac/inc/sir_api.h

@@ -362,7 +362,7 @@ typedef struct sSirSmeRsp {
 	uint16_t messageType;   /* eWNI_SME_*_RSP */
 	uint16_t length;
 	uint8_t sessionId;
-	tSirResultCodes statusCode;
+	tSirResultCodes status_code;
 	struct wlan_objmgr_psoc *psoc;
 } tSirSmeRsp, *tpSirSmeRsp;
 
@@ -712,7 +712,7 @@ struct start_bss_rsp {
 	uint16_t messageType;   /* eWNI_SME_START_BSS_RSP */
 	uint16_t length;
 	uint8_t sessionId;
-	tSirResultCodes statusCode;
+	tSirResultCodes status_code;
 	enum bss_type bssType;    /* Add new type for WDS mode */
 	uint16_t beaconInterval;        /* Beacon Interval for both type */
 	uint32_t staId;         /* Station ID for Self */
@@ -987,7 +987,7 @@ struct join_rsp {
 	uint16_t messageType;   /* eWNI_SME_JOIN_RSP */
 	uint16_t length;
 	uint8_t sessionId;      /* Session ID */
-	tSirResultCodes statusCode;
+	tSirResultCodes status_code;
 	tAniAuthType authType;
 	uint32_t vht_channel_width;
 	/* It holds reasonCode when join fails due to deauth/disassoc frame.
@@ -1129,7 +1129,7 @@ struct owe_assoc_ind {
 struct assoc_cnf {
 	uint16_t messageType;   /* eWNI_SME_ASSOC_CNF */
 	uint16_t length;
-	tSirResultCodes statusCode;
+	tSirResultCodes status_code;
 	struct qdf_mac_addr bssid;      /* Self BSSID */
 	struct qdf_mac_addr peer_macaddr;
 	uint16_t aid;
@@ -1235,7 +1235,7 @@ struct disassoc_rsp {
 	uint16_t messageType;   /* eWNI_SME_DISASSOC_RSP */
 	uint16_t length;
 	uint8_t sessionId;      /* Session ID */
-	tSirResultCodes statusCode;
+	tSirResultCodes status_code;
 	struct qdf_mac_addr peer_macaddr;
 	uint16_t staId;
 };
@@ -1245,7 +1245,7 @@ struct disassoc_ind {
 	uint16_t messageType;   /* eWNI_SME_DISASSOC_IND */
 	uint16_t length;
 	uint8_t sessionId;      /* Session Identifier */
-	tSirResultCodes statusCode;
+	tSirResultCodes status_code;
 	struct qdf_mac_addr bssid;
 	struct qdf_mac_addr peer_macaddr;
 	uint16_t staId;
@@ -1258,7 +1258,7 @@ struct disassoc_cnf {
 	uint16_t messageType;   /* eWNI_SME_DISASSOC_CNF */
 	uint16_t length;
 	uint8_t sme_session_id;
-	tSirResultCodes statusCode;
+	tSirResultCodes status_code;
 	struct qdf_mac_addr bssid;
 	struct qdf_mac_addr peer_macaddr;
 };
@@ -1294,7 +1294,7 @@ struct deauth_rsp {
 	uint16_t messageType;   /* eWNI_SME_DEAUTH_RSP */
 	uint16_t length;
 	uint8_t sessionId;      /* Session ID */
-	tSirResultCodes statusCode;
+	tSirResultCodes status_code;
 	struct qdf_mac_addr peer_macaddr;
 };
 
@@ -1303,7 +1303,7 @@ struct deauth_ind {
 	uint16_t messageType;   /* eWNI_SME_DEAUTH_IND */
 	uint16_t length;
 	uint8_t sessionId;      /* Added for BT-AMP */
-	tSirResultCodes statusCode;
+	tSirResultCodes status_code;
 	struct qdf_mac_addr bssid;      /* AP BSSID */
 	struct qdf_mac_addr peer_macaddr;
 
@@ -1317,7 +1317,7 @@ struct deauth_cnf {
 	uint16_t messageType;   /* eWNI_SME_DEAUTH_CNF */
 	uint16_t length;
 	uint8_t sme_session_id;
-	tSirResultCodes statusCode;
+	tSirResultCodes status_code;
 	struct qdf_mac_addr bssid;
 	struct qdf_mac_addr peer_macaddr;
 };
@@ -1377,7 +1377,7 @@ struct set_context_rsp {
 	uint16_t messageType;   /* eWNI_SME_SET_CONTEXT_RSP */
 	uint16_t length;
 	uint8_t sessionId;      /* Session ID */
-	tSirResultCodes statusCode;
+	tSirResultCodes status_code;
 	struct qdf_mac_addr peer_macaddr;
 };
 

core/mac/src/include/parser_api.h

@@ -413,7 +413,7 @@ typedef struct sSirAssocRsp {
 
 	tSirMacCapabilityInfo capabilityInfo;
 	uint16_t aid;
-	uint16_t statusCode;
+	uint16_t status_code;
 	tSirMacRateSet supportedRates;
 	tSirMacRateSet extendedRates;
 	tSirMacEdcaParamSetIE edca;

core/mac/src/pe/lim/lim_assoc_utils.c

@@ -677,7 +677,7 @@ lim_cleanup_rx_path(struct mac_context *mac, tpDphHashNode sta,
  * @sta_dsaddr: sta ds address
  * @staDsAssocId: sta ds association id
  * @mlmStaContext: MLM station context
- * @statusCode: Status code
+ * @status_code: Status code
  * @pe_session: Session entry
  *
  * This function is called to send appropriate CNF message to SME.
@@ -687,15 +687,15 @@ lim_cleanup_rx_path(struct mac_context *mac, tpDphHashNode sta,
 void
 lim_send_del_sta_cnf(struct mac_context *mac, struct qdf_mac_addr sta_dsaddr,
 		     uint16_t staDsAssocId, tLimMlmStaContext mlmStaContext,
-		     tSirResultCodes statusCode, struct pe_session *pe_session)
+		     tSirResultCodes status_code, struct pe_session *pe_session)
 {
 	tLimMlmDisassocCnf mlmDisassocCnf;
 	tLimMlmDeauthCnf mlmDeauthCnf;
 	tLimMlmPurgeStaInd mlmPurgeStaInd;
 
-	pe_debug("Sessionid: %d staDsAssocId: %d Trigger: %d statusCode: %d sta_dsaddr: "QDF_MAC_ADDR_STR,
+	pe_debug("Sessionid: %d staDsAssocId: %d Trigger: %d status_code: %d sta_dsaddr: "QDF_MAC_ADDR_STR,
 		pe_session->peSessionId, staDsAssocId,
-		mlmStaContext.cleanupTrigger, statusCode,
+		mlmStaContext.cleanupTrigger, status_code,
 		QDF_MAC_ADDR_ARRAY(sta_dsaddr.bytes));
 
 	if (LIM_IS_STA_ROLE(pe_session)) {
@@ -729,7 +729,7 @@ lim_send_del_sta_cnf(struct mac_context *mac, struct qdf_mac_addr sta_dsaddr,
 
 		qdf_mem_copy((uint8_t *) &mlmDisassocCnf.peerMacAddr,
 			     (uint8_t *) sta_dsaddr.bytes, QDF_MAC_ADDR_SIZE);
-		mlmDisassocCnf.resultCode = statusCode;
+		mlmDisassocCnf.resultCode = status_code;
 		mlmDisassocCnf.disassocTrigger = mlmStaContext.cleanupTrigger;
 		/* Update PE session Id */
 		mlmDisassocCnf.sessionId = pe_session->peSessionId;
@@ -748,7 +748,7 @@ lim_send_del_sta_cnf(struct mac_context *mac, struct qdf_mac_addr sta_dsaddr,
 		pe_debug("Lim Posting DEAUTH_CNF to Sme. Trigger: %d",
 			mlmStaContext.cleanupTrigger);
 		qdf_copy_macaddr(&mlmDeauthCnf.peer_macaddr, &sta_dsaddr);
-		mlmDeauthCnf.resultCode = statusCode;
+		mlmDeauthCnf.resultCode = status_code;
 		mlmDeauthCnf.deauthTrigger = mlmStaContext.cleanupTrigger;
 		/* PE session Id */
 		mlmDeauthCnf.sessionId = pe_session->peSessionId;
@@ -794,7 +794,7 @@ lim_send_del_sta_cnf(struct mac_context *mac, struct qdf_mac_addr sta_dsaddr,
 		    || (mlmStaContext.resultCode ==
 			eSIR_SME_REASSOC_TIMEOUT_RESULT_CODE)) {
 			pe_debug("Lim Posting eWNI_SME_REASSOC_RSP to SME"
-				"resultCode: %d, statusCode: %d,"
+				"resultCode: %d, status_code: %d,"
 				"sessionId: %d",
 				mlmStaContext.resultCode,
 				mlmStaContext.protStatusCode,
@@ -813,7 +813,7 @@ lim_send_del_sta_cnf(struct mac_context *mac, struct qdf_mac_addr sta_dsaddr,
 			pe_session->pLimJoinReq = NULL;
 
 			pe_debug("Lim Posting eWNI_SME_JOIN_RSP to SME."
-				"resultCode: %d,statusCode: %d,"
+				"resultCode: %d,status_code: %d,"
 				"sessionId: %d",
 				mlmStaContext.resultCode,
 				mlmStaContext.protStatusCode,
@@ -840,7 +840,7 @@ lim_send_del_sta_cnf(struct mac_context *mac, struct qdf_mac_addr sta_dsaddr,
 
 		qdf_mem_copy((uint8_t *) &mlmDisassocCnf.peerMacAddr,
 			     (uint8_t *) sta_dsaddr.bytes, QDF_MAC_ADDR_SIZE);
-		mlmDisassocCnf.resultCode = statusCode;
+		mlmDisassocCnf.resultCode = status_code;
 		mlmDisassocCnf.disassocTrigger = eLIM_DUPLICATE_ENTRY;
 		/* Update PE session Id */
 		mlmDisassocCnf.sessionId = pe_session->peSessionId;
@@ -4580,7 +4580,7 @@ returnFailure:
  *
  * @mac:          mac global context
  * @sta:        sta dph node
- * @statusCode:    status code
+ * @status_code:    status code
  * @pe_session: session context
  *
  * deletes DPH entry, changes the MLM mode for station, calls
@@ -4590,7 +4590,7 @@ returnFailure:
  */
 void
 lim_prepare_and_send_del_sta_cnf(struct mac_context *mac, tpDphHashNode sta,
-				 tSirResultCodes statusCode,
+				 tSirResultCodes status_code,
 				 struct pe_session *pe_session)
 {
 	uint16_t staDsAssocId = 0;
@@ -4619,7 +4619,7 @@ lim_prepare_and_send_del_sta_cnf(struct mac_context *mac, tpDphHashNode sta,
 				 pe_session->limMlmState));
 	}
 	lim_send_del_sta_cnf(mac, sta_dsaddr, staDsAssocId, mlmStaContext,
-			     statusCode, pe_session);
+			     status_code, pe_session);
 }
 
 /** -------------------------------------------------------------

core/mac/src/pe/lim/lim_assoc_utils.h

@@ -169,7 +169,8 @@ static inline bool lim_is_roam_synch_in_progress(struct pe_session *pe_session)
 void
 lim_send_del_sta_cnf(struct mac_context *mac, struct qdf_mac_addr sta_dsaddr,
 		     uint16_t staDsAssocId, tLimMlmStaContext mlmStaContext,
-		     tSirResultCodes statusCode, struct pe_session *pe_session);
+		     tSirResultCodes status_code,
+		     struct pe_session *pe_session);
 
 void lim_handle_cnf_wait_timeout(struct mac_context *mac, uint16_t staId);
 void lim_delete_dph_hash_entry(struct mac_context *, tSirMacAddr, uint16_t, struct pe_session *);
@@ -191,8 +192,11 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
 QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac, uint8_t updateEntry,
 					     struct pe_session *pe_session);
 
-void lim_prepare_and_send_del_sta_cnf(struct mac_context *mac, tpDphHashNode sta,
-				      tSirResultCodes statusCode, struct pe_session *);
+void lim_prepare_and_send_del_sta_cnf(struct mac_context *mac,
+				      tpDphHashNode sta,
+				      tSirResultCodes status_code,
+				      struct pe_session *pe_session);
+
 QDF_STATUS lim_extract_ap_capabilities(struct mac_context *mac, uint8_t *pIE,
 					  uint16_t ieLen,
 					  tpSirProbeRespBeacon beaconStruct);

core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c

@@ -478,7 +478,7 @@ lim_handle_assoc_reject_status(struct mac_context *mac_ctx,
 		assoc_rsp->TimeoutInterval.timeoutValue;
 
 	if (!(session_entry->limRmfEnabled &&
-		    assoc_rsp->statusCode == eSIR_MAC_TRY_AGAIN_LATER &&
+		    assoc_rsp->status_code == eSIR_MAC_TRY_AGAIN_LATER &&
 		   (assoc_rsp->TimeoutInterval.present &&
 			(assoc_rsp->TimeoutInterval.timeoutType ==
 				SIR_MAC_TI_TYPE_ASSOC_COMEBACK))))
@@ -697,7 +697,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx,
 			sizeof(tSirMacRateSet));
 	}
 
-	assoc_cnf.protStatusCode = assoc_rsp->statusCode;
+	assoc_cnf.protStatusCode = assoc_rsp->status_code;
 	if (session_entry->assocRsp) {
 		pe_warn("session_entry->assocRsp is not NULL freeing it and setting NULL");
 		qdf_mem_free(session_entry->assocRsp);
@@ -777,7 +777,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx,
 				       hdr->sa);
 
 	if (eSIR_MAC_XS_FRAME_LOSS_POOR_CHANNEL_RSSI_STATUS ==
-	   assoc_rsp->statusCode &&
+	   assoc_rsp->status_code &&
 	    assoc_rsp->rssi_assoc_rej.present) {
 		struct sir_rssi_disallow_lst ap_info = {{0}};
 
@@ -788,13 +788,13 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx,
 					WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info);
 		lim_add_bssid_to_reject_list(mac_ctx->pdev, &ap_info);
 	}
-	if (assoc_rsp->statusCode != eSIR_MAC_SUCCESS_STATUS) {
+	if (assoc_rsp->status_code != eSIR_MAC_SUCCESS_STATUS) {
 		/*
 		 *Re/Association response was received
 		 * either with failure code.
 		*/
 		pe_err("received Re/AssocRsp frame failure code: %d",
-			 assoc_rsp->statusCode);
+			 assoc_rsp->status_code);
 		/*
 		 * Need to update 'association failure' error counter
 		 * along with STATUS CODE
@@ -870,8 +870,9 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx,
 				&assoc_rsp->obss_scanparams);
 
 	lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_ROAM_ASSOC_COMP_EVENT,
-			session_entry, assoc_rsp->statusCode ? QDF_STATUS_E_FAILURE :
-			QDF_STATUS_SUCCESS, assoc_rsp->statusCode);
+			      session_entry,
+			      (assoc_rsp->status_code ? QDF_STATUS_E_FAILURE :
+			       QDF_STATUS_SUCCESS), assoc_rsp->status_code);
 
 	ap_nss = lim_get_nss_supported_by_ap(&assoc_rsp->VHTCaps,
 					     &assoc_rsp->HTCaps);

core/mac/src/pe/lim/lim_process_mlm_req_messages.c

@@ -1274,7 +1274,7 @@ lim_process_mlm_disassoc_req_ntf(struct mac_context *mac_ctx,
 			sme_disassoc_rsp->length = sizeof(*sme_disassoc_rsp);
 			sme_disassoc_rsp->sessionId =
 					mlm_disassocreq->sessionId;
-			sme_disassoc_rsp->statusCode = eSIR_SME_DEAUTH_STATUS;
+			sme_disassoc_rsp->status_code = eSIR_SME_DEAUTH_STATUS;
 
 			qdf_copy_macaddr(&sme_disassoc_rsp->peer_macaddr,
 					 &mlm_disassocreq->peer_macaddr);
@@ -1623,7 +1623,7 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx,
 						eWNI_SME_DEAUTH_RSP;
 				sme_deauth_rsp->length =
 						sizeof(*sme_deauth_rsp);
-				sme_deauth_rsp->statusCode =
+				sme_deauth_rsp->status_code =
 						eSIR_SME_DEAUTH_STATUS;
 				sme_deauth_rsp->sessionId =
 						mlm_deauth_req->sessionId;

core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c

@@ -1610,7 +1610,7 @@ void lim_process_sta_mlm_del_bss_rsp(struct mac_context *mac,
 	tpDphHashNode sta =
 		dph_get_hash_entry(mac, DPH_STA_HASH_INDEX_PEER,
 				   &pe_session->dph.dphHashTable);
-	tSirResultCodes statusCode = eSIR_SME_SUCCESS;
+	tSirResultCodes status_code = eSIR_SME_SUCCESS;
 
 	if (!pDelBssParams) {
 		pe_err("Invalid body pointer in message");
@@ -1624,26 +1624,26 @@ void lim_process_sta_mlm_del_bss_rsp(struct mac_context *mac,
 			    pe_session->selfMacAddr, NULL,
 			    NULL) != QDF_STATUS_SUCCESS) {
 			pe_err("Failure in setting link state to IDLE");
-			statusCode = eSIR_SME_REFUSED;
+			status_code = eSIR_SME_REFUSED;
 			goto end;
 		}
 		if (!sta) {
 			pe_err("DPH Entry for STA 1 missing");
-			statusCode = eSIR_SME_REFUSED;
+			status_code = eSIR_SME_REFUSED;
 			goto end;
 		}
 		if (eLIM_MLM_WT_DEL_BSS_RSP_STATE !=
 		    sta->mlmStaContext.mlmState) {
 			pe_err("Received unexpected WMA_DEL_BSS_RSP in state %X",
 				       sta->mlmStaContext.mlmState);
-			statusCode = eSIR_SME_REFUSED;
+			status_code = eSIR_SME_REFUSED;
 			goto end;
 		}
 		pe_debug("STA AssocID %d MAC",	sta->assocId);
 		       lim_print_mac_addr(mac, sta->staAddr, LOGD);
 	} else {
 		pe_err("DEL BSS failed!");
-		statusCode = eSIR_SME_STOP_BSS_FAILURE;
+		status_code = eSIR_SME_STOP_BSS_FAILURE;
 	}
 end:
 	if (0 != limMsgQ->bodyptr) {
@@ -1666,7 +1666,7 @@ end:
 		lim_handle_del_bss_in_re_assoc_context(mac, sta, pe_session);
 		return;
 	}
-	lim_prepare_and_send_del_sta_cnf(mac, sta, statusCode, pe_session);
+	lim_prepare_and_send_del_sta_cnf(mac, sta, status_code, pe_session);
 	return;
 }
 
@@ -1900,7 +1900,7 @@ void lim_process_sta_mlm_del_sta_rsp(struct mac_context *mac,
 				     struct scheduler_msg *limMsgQ,
 				     struct pe_session *pe_session)
 {
-	tSirResultCodes statusCode = eSIR_SME_SUCCESS;
+	tSirResultCodes status_code = eSIR_SME_SUCCESS;
 	tpDeleteStaParams pDelStaParams = (tpDeleteStaParams) limMsgQ->bodyptr;
 
 	if (!pDelStaParams) {
@@ -1924,7 +1924,7 @@ void lim_process_sta_mlm_del_sta_rsp(struct mac_context *mac,
 	if (eLIM_MLM_WT_DEL_STA_RSP_STATE != pe_session->limMlmState) {
 		pe_err("Received unexpected WDA_DELETE_STA_RSP in state %s",
 			lim_mlm_state_str(pe_session->limMlmState));
-		statusCode = eSIR_SME_REFUSED;
+		status_code = eSIR_SME_REFUSED;
 		goto end;
 	}
 	/*

core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -2285,11 +2285,11 @@ void __lim_process_sme_disassoc_cnf(struct mac_context *mac, uint32_t *pMsgBuf)
 	if (smeDisassocCnf.messageType == eWNI_SME_DISASSOC_CNF)
 		lim_diag_event_report(mac, WLAN_PE_DIAG_DISASSOC_CNF_EVENT,
 				      pe_session,
-				      (uint16_t) smeDisassocCnf.statusCode, 0);
+				      (uint16_t)smeDisassocCnf.status_code, 0);
 	else if (smeDisassocCnf.messageType == eWNI_SME_DEAUTH_CNF)
 		lim_diag_event_report(mac, WLAN_PE_DIAG_DEAUTH_CNF_EVENT,
 				      pe_session,
-				      (uint16_t) smeDisassocCnf.statusCode, 0);
+				      (uint16_t)smeDisassocCnf.status_code, 0);
 #endif /* FEATURE_WLAN_DIAG_SUPPORT */
 
 	switch (GET_LIM_SYSTEM_ROLE(pe_session)) {
@@ -3083,7 +3083,7 @@ void __lim_process_sme_assoc_cnf_new(struct mac_context *mac_ctx, uint32_t msg_t
 	lim_deactivate_and_change_per_sta_id_timer(mac_ctx,
 			eLIM_CNF_WAIT_TIMER, sta_ds->assocId);
 
-	if (assoc_cnf.statusCode == eSIR_SME_SUCCESS) {
+	if (assoc_cnf.status_code == eSIR_SME_SUCCESS) {
 		/*
 		 * In BTAMP-AP, PE already finished the WMA_ADD_STA sequence
 		 * when it had received Assoc Request frame. Now, PE just needs
@@ -3116,7 +3116,7 @@ void __lim_process_sme_assoc_cnf_new(struct mac_context *mac_ctx, uint32_t msg_t
 		if (!sta_ds->mlmStaContext.updateContext)
 			sta_ds->mlmStaContext.updateContext = 1;
 		pe_debug("Recv Assoc Cnf, status Code : %d(assoc id=%d) Reason code: %d",
-			 assoc_cnf.statusCode, sta_ds->assocId,
+			 assoc_cnf.status_code, sta_ds->assocId,
 			 assoc_cnf.mac_status_code);
 		if (assoc_cnf.mac_status_code)
 			mac_status_code = assoc_cnf.mac_status_code;

core/mac/src/pe/lim/lim_send_management_frames.c

@@ -3947,7 +3947,7 @@ lim_send_neighbor_report_request_frame(struct mac_context *mac,
 				       tpSirMacNeighborReportReq pNeighborReq,
 				       tSirMacAddr peer, struct pe_session *pe_session)
 {
-	QDF_STATUS statusCode = QDF_STATUS_SUCCESS;
+	QDF_STATUS status_code = QDF_STATUS_SUCCESS;
 	tDot11fNeighborReportRequest frm;
 	uint8_t *pFrame;
 	tpSirMacMgmtHdr pMacHdr;
@@ -4020,7 +4020,7 @@ lim_send_neighbor_report_request_frame(struct mac_context *mac,
 			nStatus);
 
 		/* FIXME - Need to convert to QDF_STATUS */
-		statusCode = QDF_STATUS_E_FAILURE;
+		status_code = QDF_STATUS_E_FAILURE;
 		goto returnAfterError;
 	} else if (DOT11F_WARNED(nStatus)) {
 		pe_warn("There were warnings while packing Neighbor Report Request (0x%08x)",
@@ -4048,16 +4048,16 @@ lim_send_neighbor_report_request_frame(struct mac_context *mac,
 			 pe_session->peSessionId, qdf_status));
 	if (QDF_STATUS_SUCCESS != qdf_status) {
 		pe_err("wma_tx_frame FAILED! Status [%d]", qdf_status);
-		statusCode = QDF_STATUS_E_FAILURE;
+		status_code = QDF_STATUS_E_FAILURE;
 		/* Pkt will be freed up by the callback */
-		return statusCode;
+		return status_code;
 	} else
 		return QDF_STATUS_SUCCESS;
 
 returnAfterError:
 	cds_packet_free((void *)pPacket);
 
-	return statusCode;
+	return status_code;
 } /* End lim_send_neighbor_report_request_frame. */
 
 /**
@@ -4082,7 +4082,7 @@ lim_send_link_report_action_frame(struct mac_context *mac,
 				  tpSirMacLinkReport pLinkReport,
 				  tSirMacAddr peer, struct pe_session *pe_session)
 {
-	QDF_STATUS statusCode = QDF_STATUS_SUCCESS;
+	QDF_STATUS status_code = QDF_STATUS_SUCCESS;
 	tDot11fLinkMeasurementReport frm;
 	uint8_t *pFrame;
 	tpSirMacMgmtHdr pMacHdr;
@@ -4164,7 +4164,7 @@ lim_send_link_report_action_frame(struct mac_context *mac,
 		pe_err("Failed to pack an Link Report (0x%08x)", nStatus);
 
 		/* FIXME - Need to convert to QDF_STATUS */
-		statusCode = QDF_STATUS_E_FAILURE;
+		status_code = QDF_STATUS_E_FAILURE;
 		goto returnAfterError;
 	} else if (DOT11F_WARNED(nStatus)) {
 		pe_warn("There were warnings while packing Link Report (0x%08x)",
@@ -4192,16 +4192,16 @@ lim_send_link_report_action_frame(struct mac_context *mac,
 			 pe_session->peSessionId, qdf_status));
 	if (QDF_STATUS_SUCCESS != qdf_status) {
 		pe_err("wma_tx_frame FAILED! Status [%d]", qdf_status);
-		statusCode = QDF_STATUS_E_FAILURE;
+		status_code = QDF_STATUS_E_FAILURE;
 		/* Pkt will be freed up by the callback */
-		return statusCode;
+		return status_code;
 	} else
 		return QDF_STATUS_SUCCESS;
 
 returnAfterError:
 	cds_packet_free((void *)pPacket);
 
-	return statusCode;
+	return status_code;
 } /* End lim_send_link_report_action_frame. */
 
 QDF_STATUS
@@ -4213,7 +4213,7 @@ lim_send_radio_measure_report_action_frame(struct mac_context *mac,
 				tSirMacAddr peer,
 				struct pe_session *pe_session)
 {
-	QDF_STATUS statusCode = QDF_STATUS_SUCCESS;
+	QDF_STATUS status_code = QDF_STATUS_SUCCESS;
 	uint8_t *pFrame;
 	tpSirMacMgmtHdr pMacHdr;
 	uint32_t nBytes, nPayload, nStatus;
@@ -4335,7 +4335,7 @@ lim_send_radio_measure_report_action_frame(struct mac_context *mac,
 			nStatus);
 
 		/* FIXME - Need to convert to QDF_STATUS */
-		statusCode = QDF_STATUS_E_FAILURE;
+		status_code = QDF_STATUS_E_FAILURE;
 		goto returnAfterError;
 	} else if (DOT11F_WARNED(nStatus)) {
 		pe_warn("There were warnings while packing Radio Measure Report (0x%08x)",
@@ -4363,10 +4363,10 @@ lim_send_radio_measure_report_action_frame(struct mac_context *mac,
 			 pe_session->peSessionId, qdf_status));
 	if (QDF_STATUS_SUCCESS != qdf_status) {
 		pe_err("wma_tx_frame FAILED! Status [%d]", qdf_status);
-		statusCode = QDF_STATUS_E_FAILURE;
+		status_code = QDF_STATUS_E_FAILURE;
 		/* Pkt will be freed up by the callback */
 		qdf_mem_free(frm);
-		return statusCode;
+		return status_code;
 	} else {
 		qdf_mem_free(frm);
 		return QDF_STATUS_SUCCESS;
@@ -4375,7 +4375,7 @@ lim_send_radio_measure_report_action_frame(struct mac_context *mac,
 returnAfterError:
 	qdf_mem_free(frm);
 	cds_packet_free((void *)pPacket);
-	return statusCode;
+	return status_code;
 }
 
 #ifdef WLAN_FEATURE_11W

core/mac/src/pe/lim/lim_send_sme_rsp_messages.c

@@ -71,7 +71,7 @@ void lim_send_sme_rsp(struct mac_context *mac_ctx, uint16_t msg_type,
 
 	sme_rsp->messageType = msg_type;
 	sme_rsp->length = sizeof(tSirSmeRsp);
-	sme_rsp->statusCode = result_code;
+	sme_rsp->status_code = result_code;
 	sme_rsp->sessionId = sme_session_id;
 
 	msg.type = msg_type;
@@ -483,7 +483,7 @@ void lim_send_sme_join_reassoc_rsp(struct mac_context *mac_ctx,
 
 	sme_join_rsp->messageType = msg_type;
 	sme_join_rsp->length = (uint16_t) rsp_len;
-	sme_join_rsp->statusCode = result_code;
+	sme_join_rsp->status_code = result_code;
 	sme_join_rsp->protStatusCode = prot_status_code;
 
 	sme_join_rsp->sessionId = sme_session_id;
@@ -597,7 +597,7 @@ void lim_send_sme_start_bss_rsp(struct mac_context *mac,
 	pSirSmeRsp->messageType = msgType;
 	pSirSmeRsp->length = size;
 	pSirSmeRsp->sessionId = smesessionId;
-	pSirSmeRsp->statusCode = resultCode;
+	pSirSmeRsp->status_code = resultCode;
 	if (pe_session)
 		pSirSmeRsp->staId = pe_session->staId;       /* else it will be always zero smeRsp StaID = 0 */
 
@@ -712,7 +712,7 @@ void lim_send_sme_disassoc_ntf(struct mac_context *mac,
 		pSirSmeDisassocRsp->messageType = eWNI_SME_DISASSOC_RSP;
 		pSirSmeDisassocRsp->length = sizeof(struct disassoc_rsp);
 		pSirSmeDisassocRsp->sessionId = smesessionId;
-		pSirSmeDisassocRsp->statusCode = reasonCode;
+		pSirSmeDisassocRsp->status_code = reasonCode;
 		qdf_mem_copy(pSirSmeDisassocRsp->peer_macaddr.bytes,
 			     peerMacAddr, sizeof(tSirMacAddr));
 
@@ -754,7 +754,7 @@ void lim_send_sme_disassoc_ntf(struct mac_context *mac,
 		pSirSmeDisassocInd->length = sizeof(*pSirSmeDisassocInd);
 		pSirSmeDisassocInd->sessionId = smesessionId;
 		pSirSmeDisassocInd->reasonCode = reasonCode;
-		pSirSmeDisassocInd->statusCode = reasonCode;
+		pSirSmeDisassocInd->status_code = reasonCode;
 		qdf_mem_copy(pSirSmeDisassocInd->bssid.bytes,
 			     pe_session->bssId, sizeof(tSirMacAddr));
 		qdf_mem_copy(pSirSmeDisassocInd->peer_macaddr.bytes,
@@ -806,7 +806,7 @@ lim_send_sme_disassoc_ind(struct mac_context *mac, tpDphHashNode sta,
 	pSirSmeDisassocInd->length = sizeof(*pSirSmeDisassocInd);
 
 	pSirSmeDisassocInd->sessionId = pe_session->smeSessionId;
-	pSirSmeDisassocInd->statusCode = eSIR_SME_DEAUTH_STATUS;
+	pSirSmeDisassocInd->status_code = eSIR_SME_DEAUTH_STATUS;
 	pSirSmeDisassocInd->reasonCode = sta->mlmStaContext.disassocReason;
 
 	qdf_mem_copy(pSirSmeDisassocInd->bssid.bytes, pe_session->bssId,
@@ -860,11 +860,11 @@ lim_send_sme_deauth_ind(struct mac_context *mac, tpDphHashNode sta,
 
 	pSirSmeDeauthInd->sessionId = pe_session->smeSessionId;
 	if (eSIR_INFRA_AP_MODE == pe_session->bssType) {
-		pSirSmeDeauthInd->statusCode =
+		pSirSmeDeauthInd->status_code =
 			(tSirResultCodes) sta->mlmStaContext.cleanupTrigger;
 	} else {
 		/* Need to indicate the reason code over the air */
-		pSirSmeDeauthInd->statusCode =
+		pSirSmeDeauthInd->status_code =
 			(tSirResultCodes) sta->mlmStaContext.disassocReason;
 	}
 	/* BSSID */
@@ -1051,7 +1051,7 @@ void lim_send_sme_deauth_ntf(struct mac_context *mac, tSirMacAddr peerMacAddr,
 			 reasonCode, QDF_MAC_ADDR_ARRAY(peerMacAddr));
 		pSirSmeDeauthRsp->messageType = eWNI_SME_DEAUTH_RSP;
 		pSirSmeDeauthRsp->length = sizeof(*pSirSmeDeauthRsp);
-		pSirSmeDeauthRsp->statusCode = reasonCode;
+		pSirSmeDeauthRsp->status_code = reasonCode;
 		pSirSmeDeauthRsp->sessionId = smesessionId;
 
 		pBuf = (uint8_t *) pSirSmeDeauthRsp->peer_macaddr.bytes;
@@ -1091,7 +1091,7 @@ void lim_send_sme_deauth_ntf(struct mac_context *mac, tSirMacAddr peerMacAddr,
 		pSirSmeDeauthInd->length = sizeof(*pSirSmeDeauthInd);
 		pSirSmeDeauthInd->reasonCode = eSIR_MAC_UNSPEC_FAILURE_REASON;
 		pSirSmeDeauthInd->sessionId = smesessionId;
-		pSirSmeDeauthInd->statusCode = reasonCode;
+		pSirSmeDeauthInd->status_code = reasonCode;
 		qdf_mem_copy(pSirSmeDeauthInd->bssid.bytes, pe_session->bssId,
 			     sizeof(tSirMacAddr));
 		qdf_mem_copy(pSirSmeDeauthInd->peer_macaddr.bytes, peerMacAddr,
@@ -1199,7 +1199,7 @@ void lim_send_sme_set_context_rsp(struct mac_context *mac,
 
 	set_context_rsp->messageType = eWNI_SME_SETCONTEXT_RSP;
 	set_context_rsp->length = sizeof(*set_context_rsp);
-	set_context_rsp->statusCode = resultCode;
+	set_context_rsp->status_code = resultCode;
 
 	qdf_copy_macaddr(&set_context_rsp->peer_macaddr, &peer_macaddr);
 

core/mac/src/pe/lim/lim_timer_utils.c

@@ -904,16 +904,16 @@ void lim_activate_auth_rsp_timer(struct mac_context *mac, tLimPreAuthNode *pAuth
 void lim_cnf_wait_tmer_handler(void *pMacGlobal, uint32_t param)
 {
 	struct scheduler_msg msg = {0};
-	uint32_t statusCode;
+	uint32_t status_code;
 	struct mac_context *mac = (struct mac_context *) pMacGlobal;
 
 	msg.type = SIR_LIM_CNF_WAIT_TIMEOUT;
 	msg.bodyval = (uint32_t) param;
 	msg.bodyptr = NULL;
 
-	statusCode = lim_post_msg_api(mac, &msg);
-	if (statusCode != QDF_STATUS_SUCCESS)
-		pe_err("posting to LIM failed, reason: %d", statusCode);
+	status_code = lim_post_msg_api(mac, &msg);
+	if (status_code != QDF_STATUS_SUCCESS)
+		pe_err("posting to LIM failed, reason: %d", status_code);
 
 }
 

core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -2983,7 +2983,7 @@ sir_convert_assoc_resp_frame2_struct(struct mac_context *mac,
 	pAssocRsp->capabilityInfo.delayedBA = ar->Capabilities.delayedBA;
 	pAssocRsp->capabilityInfo.immediateBA = ar->Capabilities.immediateBA;
 
-	pAssocRsp->statusCode = ar->Status.status;
+	pAssocRsp->status_code = ar->Status.status;
 	pAssocRsp->aid = ar->AID.associd;
 #ifdef WLAN_FEATURE_11W
 	if (ar->TimeoutInterval.present) {

core/sap/inc/sap_api.h

@@ -265,7 +265,7 @@ typedef struct sap_StationAssocReassocCompleteEvent_s {
 	uint8_t status;
 	uint8_t *ies;
 	uint32_t ies_len;
-	uint32_t statusCode;
+	uint32_t status_code;
 	bool wmmEnabled;
 	uint8_t timingMeasCap;
 	struct oem_channel_info chan_info;
@@ -291,7 +291,7 @@ typedef struct sap_StationDisassocCompleteEvent_s {
 	struct qdf_mac_addr staMac;
 	uint8_t staId;          /* STAID should not be used */
 	uint8_t status;
-	uint32_t statusCode;
+	uint32_t status_code;
 	uint32_t reason_code;
 	eSapDisassocReason reason;
 	int rssi;

core/sap/src/sap_fsm.c

@@ -1626,7 +1626,7 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx,
 		qdf_copy_macaddr(&reassoc_complete->staMac,
 				 &csr_roaminfo->peerMac);
 		reassoc_complete->staId = csr_roaminfo->staId;
-		reassoc_complete->statusCode = csr_roaminfo->statusCode;
+		reassoc_complete->status_code = csr_roaminfo->status_code;
 
 		if (csr_roaminfo->assocReqLength < ASSOC_REQ_IE_OFFSET) {
 			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
@@ -1716,7 +1716,7 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx,
 		else
 			disassoc_comp->reason = eSAP_MAC_INITATED_DISASSOC;
 
-		disassoc_comp->statusCode = csr_roaminfo->statusCode;
+		disassoc_comp->status_code = csr_roaminfo->status_code;
 		disassoc_comp->status = (eSapStatus) context;
 		disassoc_comp->rssi = csr_roaminfo->rssi;
 		disassoc_comp->rx_rate = csr_roaminfo->rx_rate;

core/sme/inc/csr_api.h

@@ -1074,7 +1074,7 @@ struct csr_roam_info {
 	 * eCSR_ROAM_RESULT_IBSS_NEW_PEER or PEER_DEPARTED
 	 */
 	struct qdf_mac_addr peerMac;
-	tSirResultCodes statusCode;
+	tSirResultCodes status_code;
 	/* this'd be our own defined or sent from otherBSS(per 802.11spec) */
 	uint32_t reasonCode;
 
@@ -1192,7 +1192,7 @@ typedef struct sSirSmeAssocIndToUpperLayerCnf {
 	uint16_t messageType;   /* eWNI_SME_ASSOC_CNF */
 	uint16_t length;
 	uint8_t sessionId;
-	tSirResultCodes statusCode;
+	tSirResultCodes status_code;
 	tSirMacAddr bssId;      /* Self BSSID */
 	tSirMacAddr peerMacAddr;
 	uint16_t aid;

core/sme/inc/csr_internal.h

@@ -410,9 +410,9 @@ struct csr_channel_powerinfo {
 };
 
 struct csr_roam_joinstatus {
-	tSirResultCodes statusCode;
+	tSirResultCodes status_code;
 	/*
-	 * this is set to unspecified if statusCode indicates timeout.
+	 * this is set to unspecified if status_code indicates timeout.
 	 * Or it is the failed reason from the other BSS(per 802.11 spec)
 	 */
 	uint32_t reasonCode;

core/sme/src/csr/csr_api_roam.c

@@ -3367,7 +3367,7 @@ QDF_STATUS csr_roam_call_callback(struct mac_context *mac, uint32_t sessionId,
 	if (eCSR_ROAM_ASSOCIATION_COMPLETION == u1 &&
 			eCSR_ROAM_RESULT_ASSOCIATED == u2 && roam_info) {
 		sme_debug("Assoc complete result: %d status: %d reason: %d",
-			u2, roam_info->statusCode, roam_info->reasonCode);
+			u2, roam_info->status_code, roam_info->reasonCode);
 		beacon_ies = qdf_mem_malloc(sizeof(tDot11fBeaconIEs));
 		if ((beacon_ies) && (roam_info->bss_desc)) {
 			status = csr_parse_bss_description_ies(
@@ -5349,7 +5349,7 @@ static enum csr_join_state csr_roam_join_next_bss(struct mac_context *mac_ctx,
 			 */
 			roam_info->bss_desc = cmd->u.roamCmd.pLastRoamBss;
 			join_status = &session->joinFailStatusCode;
-			roam_info->statusCode = join_status->statusCode;
+			roam_info->status_code = join_status->status_code;
 			roam_info->reasonCode = join_status->reasonCode;
 		}
 		done = csr_roam_select_bss(mac_ctx,
@@ -6341,7 +6341,8 @@ static void csr_roam_process_results_default(struct mac_context *mac_ctx,
 			session_id);
 		roam_info->bss_desc = cmd->u.roamCmd.pLastRoamBss;
 		roam_info->pProfile = &cmd->u.roamCmd.roamProfile;
-		roam_info->statusCode = session->joinFailStatusCode.statusCode;
+		roam_info->status_code =
+			session->joinFailStatusCode.status_code;
 		roam_info->reasonCode = session->joinFailStatusCode.reasonCode;
 		qdf_mem_copy(&roam_info->bssid,
 			     &session->joinFailStatusCode.bssId,
@@ -6477,7 +6478,7 @@ static void csr_roam_process_results_default(struct mac_context *mac_ctx,
 			roam_info->reasonCode = eCSR_ROAM_RESULT_FORCED;
 			/* Update the MAC reason code */
 			roam_info->disassoc_reason = cmd->u.roamCmd.reason;
-			roam_info->statusCode = eSIR_SME_SUCCESS;
+			roam_info->status_code = eSIR_SME_SUCCESS;
 			status = csr_roam_call_callback(mac_ctx, session_id,
 							roam_info,
 							cmd->u.roamCmd.roamId,
@@ -6682,7 +6683,8 @@ static void csr_roam_process_start_bss_success(struct mac_context *mac_ctx,
 		 * start the BSS ourself, handler of eSIR_SME_JOINED_NEW_BSS
 		 * will trigger the connection start indication in Vista
 		 */
-		roam_info->statusCode = session->joinFailStatusCode.statusCode;
+		roam_info->status_code =
+				session->joinFailStatusCode.status_code;
 		roam_info->reasonCode = session->joinFailStatusCode.reasonCode;
 		/* We start the IBSS (didn't find any matched IBSS out there) */
 		roam_info->bss_desc = bss_desc;
@@ -7203,8 +7205,8 @@ static void csr_roam_process_join_res(struct mac_context *mac_ctx,
 				&assoc_info);
 #endif
 		roam_info->bss_desc = bss_desc;
-		roam_info->statusCode =
-			session->joinFailStatusCode.statusCode;
+		roam_info->status_code =
+			session->joinFailStatusCode.status_code;
 		roam_info->reasonCode =
 			session->joinFailStatusCode.reasonCode;
 #ifndef WLAN_MDM_CODE_REDUCTION_OPT
@@ -7389,7 +7391,8 @@ static bool csr_roam_process_results(struct mac_context *mac_ctx, tSmeCmd *cmd,
 			qdf_mem_copy(&roam_info->bssid,
 				     &roam_info->bss_desc->bssId,
 				     sizeof(struct qdf_mac_addr));
-		roam_info->statusCode = session->joinFailStatusCode.statusCode;
+		roam_info->status_code =
+			session->joinFailStatusCode.status_code;
 		roam_info->reasonCode = session->joinFailStatusCode.reasonCode;
 		roam_info->nBeaconLength = session->connectedInfo.nBeaconLength;
 		roam_info->nAssocReqLength =
@@ -8754,7 +8757,7 @@ static void csr_roam_join_rsp_processor(struct mac_context *mac,
 	if (session_ptr->is_fils_connection)
 		session_ptr->fils_seq_num = pSmeJoinRsp->fils_seq_num;
 
-	if (eSIR_SME_SUCCESS == pSmeJoinRsp->statusCode) {
+	if (eSIR_SME_SUCCESS == pSmeJoinRsp->status_code) {
 		if (pCommand
 		    && eCsrSmeIssuedAssocToSimilarAP ==
 		    pCommand->u.roamCmd.roamReason) {
@@ -8791,12 +8794,12 @@ static void csr_roam_join_rsp_processor(struct mac_context *mac,
 		 */
 		if (pCommand)
 			roamId = pCommand->u.roamCmd.roamId;
-		session_ptr->joinFailStatusCode.statusCode =
-			pSmeJoinRsp->statusCode;
+		session_ptr->joinFailStatusCode.status_code =
+			pSmeJoinRsp->status_code;
 		session_ptr->joinFailStatusCode.reasonCode =
 			pSmeJoinRsp->protStatusCode;
-		sme_warn("SmeJoinReq failed with statusCode= 0x%08X [%d]",
-			pSmeJoinRsp->statusCode, pSmeJoinRsp->statusCode);
+		sme_warn("SmeJoinReq failed with status_code= 0x%08X [%d]",
+			 pSmeJoinRsp->status_code, pSmeJoinRsp->status_code);
 		/* If Join fails while Handoff is in progress, indicate
 		 * disassociated event to supplicant to reconnect
 		 */
@@ -8878,7 +8881,7 @@ static void csr_roam_join_rsp_processor(struct mac_context *mac,
 					pSmeJoinRsp->sessionId);
 		}
 		csr_roam_free_connected_info(mac, prev_connect_info);
-	} /*else: ( eSIR_SME_SUCCESS == pSmeJoinRsp->statusCode ) */
+	} /*else: ( eSIR_SME_SUCCESS == pSmeJoinRsp->status_code ) */
 }
 
 static QDF_STATUS csr_roam_issue_join(struct mac_context *mac, uint32_t sessionId,
@@ -8951,7 +8954,7 @@ csr_roam_reissue_roam_command(struct mac_context *mac, uint8_t session_id)
 	if (!roam_info)
 		return;
 	roam_info->bss_desc = pCommand->u.roamCmd.pLastRoamBss;
-	roam_info->statusCode = pSession->joinFailStatusCode.statusCode;
+	roam_info->status_code = pSession->joinFailStatusCode.status_code;
 	roam_info->reasonCode = pSession->joinFailStatusCode.reasonCode;
 	pSession->connectState = eCSR_ASSOC_STATE_TYPE_INFRA_DISCONNECTED;
 	csr_roam_call_callback(mac, sessionId, roam_info,
@@ -9177,7 +9180,7 @@ static void csr_roam_roaming_state_reassoc_rsp_processor(struct mac_context *mac
 
 	pNeighborRoamInfo =
 		&mac->roam.neighborRoamInfo[pSmeJoinRsp->sessionId];
-	if (eSIR_SME_SUCCESS == pSmeJoinRsp->statusCode) {
+	if (eSIR_SME_SUCCESS == pSmeJoinRsp->status_code) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			 "CSR SmeReassocReq Successful");
 		result = eCsrReassocSuccess;
@@ -9216,19 +9219,19 @@ static void csr_roam_roaming_state_reassoc_rsp_processor(struct mac_context *mac
 	 */
 	else {
 		sme_warn(
-			"CSR SmeReassocReq failed with statusCode= 0x%08X [%d]",
-			pSmeJoinRsp->statusCode, pSmeJoinRsp->statusCode);
+			"CSR SmeReassocReq failed with status_code= 0x%08X [%d]",
+			pSmeJoinRsp->status_code, pSmeJoinRsp->status_code);
 		result = eCsrReassocFailure;
 		cds_flush_logs(WLAN_LOG_TYPE_FATAL,
 			WLAN_LOG_INDICATOR_HOST_DRIVER,
 			WLAN_LOG_REASON_ROAM_FAIL,
 			true, false);
 		if ((eSIR_SME_FT_REASSOC_TIMEOUT_FAILURE ==
-		     pSmeJoinRsp->statusCode)
+		     pSmeJoinRsp->status_code)
 		    || (eSIR_SME_FT_REASSOC_FAILURE ==
-			pSmeJoinRsp->statusCode)
+			pSmeJoinRsp->status_code)
 		    || (eSIR_SME_INVALID_PARAMETERS ==
-			pSmeJoinRsp->statusCode)) {
+			pSmeJoinRsp->status_code)) {
 			/* Inform HDD to turn off FT flag in HDD */
 			if (pNeighborRoamInfo) {
 				struct csr_roam_info *roam_info;
@@ -9290,7 +9293,7 @@ static void csr_roam_roaming_state_stop_bss_rsp_processor(struct mac_context *ma
 					 LOG_WLAN_IBSS_C);
 		if (pIbssLog) {
 			pIbssLog->eventId = WLAN_IBSS_EVENT_STOP_RSP;
-			if (eSIR_SME_SUCCESS != pSmeRsp->statusCode)
+			if (eSIR_SME_SUCCESS != pSmeRsp->status_code)
 				pIbssLog->status = WLAN_IBSS_STATUS_FAILURE;
 			WLAN_HOST_DIAG_LOG_REPORT(pIbssLog);
 		}
@@ -9303,7 +9306,7 @@ static void csr_roam_roaming_state_stop_bss_rsp_processor(struct mac_context *ma
 		    mac->roam.roamSession[pSmeRsp->sessionId].pCurRoamProfile;
 		if (profile && CSR_IS_CONN_NDI(profile)) {
 			result_code = eCsrStopBssSuccess;
-			if (pSmeRsp->statusCode != eSIR_SME_SUCCESS)
+			if (pSmeRsp->status_code != eSIR_SME_SUCCESS)
 				result_code = eCsrStopBssFailure;
 		}
 		csr_roam_complete(mac, result_code, NULL, pSmeRsp->sessionId);
@@ -9663,7 +9666,7 @@ void csr_roam_roaming_state_disassoc_rsp_processor(struct mac_context *mac,
 		csr_roam_complete(mac, eCsrNothingToJoin, NULL, sessionId);
 	} else if (CSR_IS_ROAM_SUBSTATE_DISASSOC_FORCED(mac, sessionId) ||
 		   CSR_IS_ROAM_SUBSTATE_DISASSOC_REQ(mac, sessionId)) {
-		if (eSIR_SME_SUCCESS == rsp->statusCode) {
+		if (eSIR_SME_SUCCESS == rsp->status_code) {
 			sme_debug("CSR force disassociated successful");
 			/*
 			 * A callback to HDD will be issued from
@@ -9678,7 +9681,7 @@ void csr_roam_roaming_state_disassoc_rsp_processor(struct mac_context *mac,
 		/* Disassoc due to Reassoc failure falls into this codepath */
 		csr_roam_complete(mac, eCsrJoinFailure, NULL, sessionId);
 	} else {
-		if (eSIR_SME_SUCCESS == rsp->statusCode) {
+		if (eSIR_SME_SUCCESS == rsp->status_code) {
 			/*
 			 * Successfully disassociated from the 'old' Bss.
 			 * We get Disassociate response in three conditions.
@@ -9693,8 +9696,8 @@ void csr_roam_roaming_state_disassoc_rsp_processor(struct mac_context *mac,
 			 */
 			sme_debug("Disassociated successfully");
 		} else {
-			sme_err("DisassocReq failed, statusCode= 0x%08X",
-				rsp->statusCode);
+			sme_err("DisassocReq failed, status_code= 0x%08X",
+				rsp->status_code);
 		}
 		/* We are not done yet. Get the data and continue roaming */
 		csr_roam_reissue_roam_command(mac, sessionId);
@@ -9704,24 +9707,24 @@ void csr_roam_roaming_state_disassoc_rsp_processor(struct mac_context *mac,
 static void csr_roam_roaming_state_deauth_rsp_processor(struct mac_context *mac,
 						struct deauth_rsp *pSmeRsp)
 {
-	tSirResultCodes statusCode;
+	tSirResultCodes status_code;
 	/* No one is sending eWNI_SME_DEAUTH_REQ to PE. */
 	sme_debug("is no-op");
-	statusCode = csr_get_de_auth_rsp_status_code(pSmeRsp);
-	mac->roam.deauthRspStatus = statusCode;
+	status_code = csr_get_de_auth_rsp_status_code(pSmeRsp);
+	mac->roam.deauthRspStatus = status_code;
 	if (CSR_IS_ROAM_SUBSTATE_DEAUTH_REQ(mac, pSmeRsp->sessionId)) {
 		csr_roam_complete(mac, eCsrNothingToJoin, NULL,
 				pSmeRsp->sessionId);
 	} else {
-		if (eSIR_SME_SUCCESS == statusCode) {
+		if (eSIR_SME_SUCCESS == status_code) {
 			/* Successfully deauth from the 'old' Bss... */
 			/* */
 			sme_debug(
 				"CSR SmeDeauthReq disassociated Successfully");
 		} else {
 			sme_warn(
-				"SmeDeauthReq failed with statusCode= 0x%08X",
-				statusCode);
+				"SmeDeauthReq failed with status_code= 0x%08X",
+				status_code);
 		}
 		/* We are not done yet. Get the data and continue roaming */
 		csr_roam_reissue_roam_command(mac, pSmeRsp->sessionId);
@@ -9734,12 +9737,12 @@ csr_roam_roaming_state_start_bss_rsp_processor(struct mac_context *mac,
 {
 	enum csr_roamcomplete_result result;
 
-	if (eSIR_SME_SUCCESS == pSmeStartBssRsp->statusCode) {
+	if (eSIR_SME_SUCCESS == pSmeStartBssRsp->status_code) {
 		sme_debug("SmeStartBssReq Successful");
 		result = eCsrStartBssSuccess;
 	} else {
-		sme_warn("SmeStartBssReq failed with statusCode= 0x%08X",
-			pSmeStartBssRsp->statusCode);
+		sme_warn("SmeStartBssReq failed with status_code= 0x%08X",
+			 pSmeStartBssRsp->status_code);
 		/* Let csr_roam_complete decide what to do */
 		result = eCsrStartBssFailure;
 	}
@@ -9775,7 +9778,7 @@ csr_roam_send_disconnect_done_indication(struct mac_context *mac_ctx,
 
 	if (CSR_IS_SESSION_VALID(mac_ctx, discon_ind->session_id)) {
 		roam_info->reasonCode = discon_ind->reason_code;
-		roam_info->statusCode = eSIR_SME_STA_NOT_ASSOCIATED;
+		roam_info->status_code = eSIR_SME_STA_NOT_ASSOCIATED;
 		qdf_mem_copy(roam_info->peerMac.bytes, discon_ind->peer_mac,
 			     ETH_ALEN);
 
@@ -9987,7 +9990,7 @@ void csr_roam_joined_state_msg_processor(struct mac_context *mac, void *pMsgBuf)
 			return;
 		}
 		/* send the status code as Success */
-		roam_info->statusCode = eSIR_SME_SUCCESS;
+		roam_info->status_code = eSIR_SME_SUCCESS;
 		roam_info->u.pConnectedProfile =
 			&pSession->connectedProfile;
 		roam_info->staId = (uint8_t) pUpperLayerAssocCnf->aid;
@@ -11247,9 +11250,9 @@ csr_send_assoc_ind_to_upper_layer_cnf_msg(struct mac_context *mac,
 	cnf->sessionId = vdev_id;
 
 	if (QDF_IS_STATUS_SUCCESS(status))
-		cnf->statusCode = eSIR_SME_SUCCESS;
+		cnf->status_code = eSIR_SME_SUCCESS;
 	else
-		cnf->statusCode = eSIR_SME_ASSOC_REFUSED;
+		cnf->status_code = eSIR_SME_ASSOC_REFUSED;
 	qdf_mem_copy(&cnf->bssId, &ind->bssId, sizeof(cnf->bssId));
 	qdf_mem_copy(&cnf->peerMacAddr, &ind->peerMacAddr,
 		     sizeof(cnf->peerMacAddr));
@@ -11338,7 +11341,7 @@ csr_roam_chk_lnk_assoc_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 	roam_info->assocReqPtr = pAssocInd->assocReqPtr;
 	roam_info->beaconPtr = pAssocInd->beaconPtr;
 	roam_info->beaconLength = pAssocInd->beaconLength;
-	roam_info->statusCode = eSIR_SME_SUCCESS;
+	roam_info->status_code = eSIR_SME_SUCCESS;
 	roam_info->u.pConnectedProfile = &session->connectedProfile;
 	roam_info->staId = (uint8_t)pAssocInd->staId;
 	roam_info->rsnIELen = (uint8_t)pAssocInd->rsnIE.length;
@@ -11401,7 +11404,7 @@ csr_roam_chk_lnk_assoc_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 					eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND);
 		if (!QDF_IS_STATUS_SUCCESS(status)) {
 			/* Refused due to Mac filtering */
-			roam_info->statusCode = eSIR_SME_ASSOC_REFUSED;
+			roam_info->status_code = eSIR_SME_ASSOC_REFUSED;
 		} else if (pAssocInd->rsnIE.length && WLAN_ELEMID_RSN ==
 			   pAssocInd->rsnIE.rsnIEdata[0]) {
 			tDot11fIERSN rsn_ie = {0};
@@ -11418,7 +11421,7 @@ csr_roam_chk_lnk_assoc_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 						      &rsn_ie,
 						      &mac_status_code))) {
 				status = QDF_STATUS_E_INVAL;
-				roam_info->statusCode =
+				roam_info->status_code =
 						eSIR_SME_ASSOC_REFUSED;
 				sme_debug("SAE peer not allowed: Status: %d",
 					  mac_status_code);
@@ -11435,7 +11438,7 @@ csr_roam_chk_lnk_assoc_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 		 * going OTA before association response
 		 */
 		if (CSR_IS_INFRA_AP(roam_info->u.pConnectedProfile) &&
-		    roam_info->statusCode != eSIR_SME_ASSOC_REFUSED) {
+		    roam_info->status_code != eSIR_SME_ASSOC_REFUSED) {
 			roam_info->fReassocReq = pAssocInd->reassocReq;
 			status = csr_send_assoc_ind_to_upper_layer_cnf_msg(
 					mac_ctx, pAssocInd, status, sessionId);
@@ -11482,7 +11485,7 @@ csr_roam_chk_lnk_disassoc_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 	sme_err("DISASSOCIATION from peer =" QDF_MAC_ADDR_STR "reason: %d status: %d session: %d",
 		QDF_MAC_ADDR_ARRAY(pDisassocInd->peer_macaddr.bytes),
 		pDisassocInd->reasonCode,
-		pDisassocInd->statusCode, sessionId);
+		pDisassocInd->status_code, sessionId);
 	/*
 	 * If we are in neighbor preauth done state then on receiving
 	 * disassoc or deauth we dont roam instead we just disassoc
@@ -11641,7 +11644,7 @@ csr_roam_chk_lnk_swt_ch_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 	sme_debug("eWNI_SME_SWITCH_CHL_IND from SME");
 	pSwitchChnInd = (struct switch_channel_ind *)msg_ptr;
 	/* Update with the new channel id. The channel id is hidden in the
-	 * statusCode.
+	 * status_code.
 	 */
 	status = csr_roam_get_session_id_from_bssid(mac_ctx,
 			&pSwitchChnInd->bssid, &sessionId);
@@ -11737,7 +11740,7 @@ csr_roam_chk_lnk_deauth_rsp(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 		qdf_copy_macaddr(&roam_info->peerMac,
 				 &pDeauthRsp->peer_macaddr);
 		roam_info->reasonCode = eCSR_ROAM_RESULT_FORCED;
-		roam_info->statusCode = pDeauthRsp->statusCode;
+		roam_info->status_code = pDeauthRsp->status_code;
 		status = csr_roam_call_callback(mac_ctx, sessionId,
 						roam_info, 0,
 						eCSR_ROAM_LOSTLINK,
@@ -11774,7 +11777,7 @@ csr_roam_chk_lnk_disassoc_rsp(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 		qdf_copy_macaddr(&roam_info->peerMac,
 				 &pDisassocRsp->peer_macaddr);
 		roam_info->reasonCode = eCSR_ROAM_RESULT_FORCED;
-		roam_info->statusCode = pDisassocRsp->statusCode;
+		roam_info->status_code = pDisassocRsp->status_code;
 		status = csr_roam_call_callback(mac_ctx, sessionId,
 						roam_info, 0,
 						eCSR_ROAM_LOSTLINK,
@@ -12212,7 +12215,7 @@ csr_roam_diag_set_ctx_rsp(struct mac_context *mac_ctx,
 	setKeyEvent.authMode =
 		(uint8_t) diag_auth_type_from_csr_type(
 					session->connectedProfile.AuthType);
-	if (eSIR_SME_SUCCESS != pRsp->statusCode)
+	if (eSIR_SME_SUCCESS != pRsp->status_code)
 		setKeyEvent.status = WLAN_SECURITY_STATUS_FAILURE;
 	WLAN_HOST_DIAG_EVENT_REPORT(&setKeyEvent, EVENT_WLAN_SECURITY);
 }
@@ -12266,7 +12269,7 @@ csr_roam_chk_lnk_set_ctx_rsp(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 			csr_roam_link_up(mac_ctx,
 					 session->connectedProfile.bssid);
 	}
-	if (eSIR_SME_SUCCESS == pRsp->statusCode) {
+	if (eSIR_SME_SUCCESS == pRsp->status_code) {
 		qdf_copy_macaddr(&roam_info->peerMac, &pRsp->peer_macaddr);
 		/* Make sure we install the GTK before indicating to HDD as
 		 * authenticated. This is to prevent broadcast packets go out
@@ -12312,7 +12315,7 @@ csr_roam_chk_lnk_set_ctx_rsp(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 		sme_err(
 			"CSR: setkey command failed(err=%d) PeerMac "
 			QDF_MAC_ADDR_STR,
-			pRsp->statusCode,
+			pRsp->status_code,
 			QDF_MAC_ADDR_ARRAY(pRsp->peer_macaddr.bytes));
 	}
 	/* keeping roam_id = 0 as nobody is using roam_id for set_key */
@@ -12874,7 +12877,7 @@ QDF_STATUS csr_roam_lost_link(struct mac_context *mac, uint32_t sessionId,
 	if (eWNI_SME_DISASSOC_IND == type) {
 		result = eCSR_ROAM_RESULT_DISASSOC_IND;
 		pDisassocIndMsg = (struct disassoc_ind *)pSirMsg;
-		pSession->roamingStatusCode = pDisassocIndMsg->statusCode;
+		pSession->roamingStatusCode = pDisassocIndMsg->status_code;
 		pSession->joinFailStatusCode.reasonCode =
 			pDisassocIndMsg->reasonCode;
 
@@ -12883,7 +12886,7 @@ QDF_STATUS csr_roam_lost_link(struct mac_context *mac, uint32_t sessionId,
 	} else if (eWNI_SME_DEAUTH_IND == type) {
 		result = eCSR_ROAM_RESULT_DEAUTH_IND;
 		pDeauthIndMsg = (struct deauth_ind *)pSirMsg;
-		pSession->roamingStatusCode = pDeauthIndMsg->statusCode;
+		pSession->roamingStatusCode = pDeauthIndMsg->status_code;
 		pSession->joinFailStatusCode.reasonCode =
 			pDeauthIndMsg->reasonCode;
 
@@ -12933,7 +12936,7 @@ QDF_STATUS csr_roam_lost_link(struct mac_context *mac, uint32_t sessionId,
 
 	/* prepare to tell HDD to disconnect */
 	qdf_mem_zero(roam_info, sizeof(*roam_info));
-	roam_info->statusCode = (tSirResultCodes) pSession->roamingStatusCode;
+	roam_info->status_code = (tSirResultCodes)pSession->roamingStatusCode;
 	roam_info->reasonCode = pSession->joinFailStatusCode.reasonCode;
 	if (eWNI_SME_DISASSOC_IND == type) {
 		/* staMacAddr */
@@ -15282,7 +15285,7 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId,
 	}
 
 	do {
-		pSession->joinFailStatusCode.statusCode = eSIR_SME_SUCCESS;
+		pSession->joinFailStatusCode.status_code = eSIR_SME_SUCCESS;
 		pSession->joinFailStatusCode.reasonCode = 0;
 		qdf_mem_copy(&pSession->joinFailStatusCode.bssId,
 		       &pBssDescription->bssId, sizeof(tSirMacAddr));
@@ -16345,7 +16348,7 @@ QDF_STATUS csr_send_mb_disassoc_cnf_msg(struct mac_context *mac,
 		if (!QDF_IS_STATUS_SUCCESS(status))
 			break;
 		pMsg->messageType = eWNI_SME_DISASSOC_CNF;
-		pMsg->statusCode = eSIR_SME_SUCCESS;
+		pMsg->status_code = eSIR_SME_SUCCESS;
 		pMsg->length = sizeof(*pMsg);
 		pMsg->sme_session_id = pDisassocInd->sessionId;
 		qdf_copy_macaddr(&pMsg->peer_macaddr,
@@ -16383,7 +16386,7 @@ QDF_STATUS csr_send_mb_deauth_cnf_msg(struct mac_context *mac,
 		if (!QDF_IS_STATUS_SUCCESS(status))
 			break;
 		pMsg->messageType = eWNI_SME_DEAUTH_CNF;
-		pMsg->statusCode = eSIR_SME_SUCCESS;
+		pMsg->status_code = eSIR_SME_SUCCESS;
 		pMsg->length = sizeof(*pMsg);
 		pMsg->sme_session_id = pDeauthInd->sessionId;
 		qdf_copy_macaddr(&pMsg->bssid, &pDeauthInd->bssid);
@@ -16422,9 +16425,9 @@ QDF_STATUS csr_send_assoc_cnf_msg(struct mac_context *mac,
 		pMsg->messageType = eWNI_SME_ASSOC_CNF;
 		pMsg->length = sizeof(*pMsg);
 		if (QDF_IS_STATUS_SUCCESS(Halstatus)) {
-			pMsg->statusCode = eSIR_SME_SUCCESS;
+			pMsg->status_code = eSIR_SME_SUCCESS;
 		} else {
-			pMsg->statusCode = eSIR_SME_ASSOC_REFUSED;
+			pMsg->status_code = eSIR_SME_ASSOC_REFUSED;
 			pMsg->mac_status_code = mac_status_code;
 		}
 		/* bssId */
@@ -16546,7 +16549,7 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(struct mac_context *mac, uint32_t
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	pSession->joinFailStatusCode.statusCode = eSIR_SME_SUCCESS;
+	pSession->joinFailStatusCode.status_code = eSIR_SME_SUCCESS;
 	pSession->joinFailStatusCode.reasonCode = 0;
 	pMsg = qdf_mem_malloc(sizeof(*pMsg));
 	if (!pMsg)
@@ -21938,7 +21941,7 @@ static QDF_STATUS csr_process_roam_sync_callback(struct mac_context *mac_ctx,
 				src_profile);
 #endif
 	assoc_info.bss_desc = bss_desc;
-	roam_info->statusCode = eSIR_SME_SUCCESS;
+	roam_info->status_code = eSIR_SME_SUCCESS;
 	roam_info->reasonCode = eSIR_SME_SUCCESS;
 	assoc_info.pProfile = session->pCurRoamProfile;
 	mac_ctx->roam.roamSession[session_id].connectState =

core/sme/src/csr/csr_api_scan.c

@@ -287,7 +287,7 @@ QDF_STATUS csr_scan_handle_search_for_ssid_failure(struct mac_context *mac_ctx,
 				struct tag_csrscan_result, Link);
 		roam_info->bss_desc = &scan_result->Result.BssDescriptor;
 	}
-	roam_info->statusCode = session->joinFailStatusCode.statusCode;
+	roam_info->status_code = session->joinFailStatusCode.status_code;
 	roam_info->reasonCode = session->joinFailStatusCode.reasonCode;
 
 	/* Only indicate assoc_completion if we indicate assoc_start. */