qcacld-3.0: Replace typedef bss_description

Host driver code has several instances of struct bss_description
that is type defined to tSirBssDescription, *tpSirBssDescription
This goes against the linux coding style. This change replaces
tpSirBssDescription with struct bss_description *.

Also Linux Coding Style doesn't welcome mixed-case names. So
cleanup some mixed-case variable names as well.

This change should be followed by changes to replace
typedef tSirBssDescription also ultimately.

Change-Id: Ic6fa2d5c7db0d0c1fe4be1096d416295dcb83779
CRs-Fixed: 2409129

core/mac/inc/sir_api.h

@@ -685,7 +685,7 @@ struct bss_description {
 	/* Please keep the structure 4 bytes aligned above the ieFields */
 	uint32_t ieFields[1];
 };
-typedef struct bss_description tSirBssDescription, *tpSirBssDescription;
+typedef struct bss_description tSirBssDescription;
 
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
 struct ht_profile {

core/mac/src/pe/include/lim_api.h

@@ -278,13 +278,13 @@ tMgmtFrmDropReason lim_is_pkt_candidate_for_drop(struct mac_context *mac,
 QDF_STATUS
 pe_roam_synch_callback(struct mac_context *mac_ctx,
 		       struct roam_offload_synch_ind *roam_sync_ind_ptr,
-		       tpSirBssDescription  bss_desc_ptr,
+		       struct bss_description *bss_desc_ptr,
 		       enum sir_roam_op_code reason);
 #else
 static inline QDF_STATUS
 pe_roam_synch_callback(struct mac_context *mac_ctx,
 		       struct roam_offload_synch_ind *roam_sync_ind_ptr,
-		       tpSirBssDescription  bss_desc_ptr,
+		       struct bss_description *bss_desc_ptr,
 		       enum sir_roam_op_code reason)
 {
 	return QDF_STATUS_E_NOSUPPORT;

core/mac/src/pe/include/lim_ft.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -110,23 +110,25 @@ static inline int lim_process_ft_pre_auth_req(struct mac_context *mac,
 
 #if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD)
 void lim_fill_ft_session(struct mac_context *mac,
-		tpSirBssDescription pbssDescription,
+		struct bss_description *pbssDescription,
 		struct pe_session *ft_session,
 		struct pe_session *pe_session);
+
 void lim_ft_prepare_add_bss_req(struct mac_context *mac, uint8_t updateEntry,
 		struct pe_session *ft_session,
-		tpSirBssDescription bssDescription);
+		struct bss_description *bssDescription);
+
 QDF_STATUS lim_send_preauth_scan_offload(struct mac_context *mac_ctx,
 		struct pe_session *session_entry, tSirFTPreAuthReq *ft_preauth_req);
 #else
 static inline void lim_fill_ft_session(struct mac_context *mac,
-		tpSirBssDescription pbssDescription,
+		struct bss_description *pbssDescription,
 		struct pe_session *ft_session,
 		struct pe_session *pe_session)
 {}
 static inline void lim_ft_prepare_add_bss_req(struct mac_context *mac,
 		uint8_t updateEntry, struct pe_session *ft_session,
-		tpSirBssDescription bssDescription)
+		struct bss_description *bssDescription)
 {}
 #endif
 

core/mac/src/pe/include/lim_ft_defs.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -59,7 +59,7 @@ typedef struct sSirFTPreAuthReq {
 	uint32_t scan_id;
 	uint16_t ft_ies_length;
 	uint8_t ft_ies[MAX_FTIE_SIZE];
-	tpSirBssDescription pbssDescription;
+	struct bss_description *pbssDescription;
 } tSirFTPreAuthReq, *tpSirFTPreAuthReq;
 
 /*-------------------------------------------------------------------------

core/mac/src/pe/include/rrm_global.h

@@ -71,7 +71,7 @@ typedef struct sSirBeaconReportXmitInd {
 	uint16_t duration;
 	uint8_t regClass;
 	uint8_t numBssDesc;
-	tpSirBssDescription pBssDescription[SIR_BCN_REPORT_MAX_BSS_DESC];
+	struct bss_description *pBssDescription[SIR_BCN_REPORT_MAX_BSS_DESC];
 } tSirBeaconReportXmitInd, *tpSirBeaconReportXmitInd;
 
 typedef struct sSirNeighborReportReqInd {

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

@@ -1932,7 +1932,7 @@ static void sir_parse_bcn_fixed_fields(struct mac_context *mac_ctx,
 static QDF_STATUS
 lim_roam_fill_bss_descr(struct mac_context *mac,
 			struct roam_offload_synch_ind *roam_offload_synch_ind_ptr,
-			tpSirBssDescription  bss_desc_ptr)
+			struct bss_description *bss_desc_ptr)
 {
 	uint32_t ie_len = 0;
 	tpSirProbeRespBeacon parsed_frm_ptr;
@@ -2115,7 +2115,7 @@ static inline void lim_copy_and_free_hlp_data_from_session(
 QDF_STATUS
 pe_roam_synch_callback(struct mac_context *mac_ctx,
 		       struct roam_offload_synch_ind *roam_sync_ind_ptr,
-		       tpSirBssDescription  bss_desc,
+		       struct bss_description *bss_desc,
 		       enum sir_roam_op_code reason)
 {
 	struct pe_session *session_ptr;

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

@@ -3529,7 +3529,7 @@ static inline void lim_set_sta_ctx_twt(tAddStaParams *sta_ctx,
 
 QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp,
 				   tpSchBeaconStruct pBeaconStruct,
-				   tpSirBssDescription bssDescription,
+				   struct bss_description *bssDescription,
 				   uint8_t updateEntry, struct pe_session *pe_session)
 {
 	struct scheduler_msg msgQ = {0};
@@ -4072,7 +4072,7 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac, uint8_t updat
 	tDot11fIEVHTOperation *vht_oper = NULL;
 	tDot11fIEVHTCaps *vht_caps = NULL;
 	uint32_t listen_interval = MLME_CFG_LISTEN_INTERVAL;
-	tpSirBssDescription bssDescription =
+	struct bss_description *bssDescription =
 		&pe_session->pLimJoinReq->bssDescription;
 	struct mlme_vht_capabilities_info *vht_cap_info;
 

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

@@ -186,7 +186,7 @@ void lim_update_assoc_sta_datas(struct mac_context *mac,
 
 QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp,
 				   tpSchBeaconStruct pBeaconStruct,
-				   tpSirBssDescription bssDescription,
+				   struct bss_description *bssDescription,
 				   uint8_t updateEntry, struct pe_session *pe_session);
 QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac, uint8_t updateEntry,
 					     struct pe_session *pe_session);

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

@@ -119,7 +119,7 @@ void lim_ft_cleanup(struct mac_context *mac, struct pe_session *pe_session)
  *------------------------------------------------------------------*/
 void lim_ft_prepare_add_bss_req(struct mac_context *mac,
 		uint8_t updateEntry, struct pe_session *ft_session,
-		tpSirBssDescription bssDescription)
+		struct bss_description *bssDescription)
 {
 	tpAddBssParams pAddBssParams = NULL;
 	tAddStaParams *sta_ctx;
@@ -521,7 +521,7 @@ static void lim_fill_dot11mode(struct mac_context *mac_ctx,
  *
  *------------------------------------------------------------------*/
 void lim_fill_ft_session(struct mac_context *mac,
-			 tpSirBssDescription pbssDescription,
+			 struct bss_description *pbssDescription,
 			 struct pe_session *ft_session, struct pe_session *pe_session)
 {
 	uint8_t currentBssUapsd;

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

@@ -402,7 +402,7 @@ void lim_handle_ft_pre_auth_rsp(struct mac_context *mac, QDF_STATUS status,
 {
 	struct pe_session *ft_session = NULL;
 	uint8_t sessionId = 0;
-	tpSirBssDescription pbssDescription = NULL;
+	struct bss_description *pbssDescription = NULL;
 #ifdef FEATURE_WLAN_DIAG_SUPPORT
 	lim_diag_event_report(mac, WLAN_PE_DIAG_PRE_AUTH_RSP_EVENT,
 			      pe_session, (uint16_t) status, 0);

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

@@ -109,7 +109,7 @@ void lim_handle_del_bss_in_re_assoc_context(struct mac_context *mac,
 		tpDphHashNode sta, struct pe_session *pe_session)
 {
 	tLimMlmReassocCnf mlmReassocCnf;
-	tpSirBssDescription bss_desc;
+	struct bss_description *bss_desc;
 	/*
 	 * Skipped the DeleteDPH Hash Entry as we need it for the new BSS
 	 * Set the MlmState to IDLE

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

@@ -342,7 +342,7 @@ lim_set_rs_nie_wp_aiefrom_sme_start_bss_req_message(struct mac_context *mac_ctx,
 
 static uint8_t
 lim_is_bss_descr_valid_in_sme_req_message(struct mac_context *mac,
-					  tpSirBssDescription pBssDescr)
+					  struct bss_description *pBssDescr)
 {
 	uint8_t valid = true;
 

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

@@ -849,7 +849,7 @@ lim_post_mlm_message(struct mac_context *mac, uint32_t msgType, uint32_t *pMsgBu
  */
 
 static inline uint16_t
-lim_get_ielen_from_bss_description(tpSirBssDescription pBssDescr)
+lim_get_ielen_from_bss_description(struct bss_description *pBssDescr)
 {
 	uint16_t ielen;
 

core/mac/src/pe/rrm/rrm_api.c

@@ -670,7 +670,7 @@ static uint8_t
 rrm_fill_beacon_ies(struct mac_context *mac,
 		    uint8_t *pIes, uint8_t *pNumIes, uint8_t pIesMaxSize,
 		    uint8_t *eids, uint8_t numEids, uint8_t start_offset,
-		    tpSirBssDescription pBssDesc)
+		    struct bss_description *pBssDesc)
 {
 	uint8_t len, *pBcnIes, count = 0, i;
 	uint16_t BcnNumIes, total_ies_len;
@@ -785,7 +785,7 @@ rrm_process_beacon_report_xmit(struct mac_context *mac_ctx,
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	tSirMacRadioMeasureReport *report = NULL;
 	tSirMacBeaconReport *beacon_report;
-	tpSirBssDescription bss_desc;
+	struct bss_description *bss_desc;
 	tpRRMReq curr_req = mac_ctx->rrm.rrmPEContext.pCurrentReq;
 	struct pe_session *session_entry;
 	uint8_t session_id, counter;

core/sme/inc/csr_api.h

@@ -1414,12 +1414,12 @@ typedef void (*tCsrSnrCallback)(int8_t snr, uint32_t staId, void *pContext);
 #ifdef WLAN_FEATURE_HOST_ROAM
 QDF_STATUS csr_roam_issue_ft_preauth_req(struct mac_context *mac_ctx,
 					 uint32_t session_id,
-					 tpSirBssDescription bss_desc);
+					 struct bss_description *bss_desc);
 #else
 static inline
 QDF_STATUS csr_roam_issue_ft_preauth_req(struct mac_context *mac_ctx,
 					 uint32_t session_id,
-					 tpSirBssDescription bss_desc)
+					 struct bss_description *bss_desc)
 {
 	return QDF_STATUS_E_NOSUPPORT;
 }

core/sme/inc/csr_internal.h

@@ -1076,10 +1076,22 @@ QDF_STATUS
 csr_roam_update_add_ies(struct mac_context *mac,
 		tSirUpdateIE *pUpdateIE, eUpdateIEsType updateType);
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
-QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(
-		struct mac_context *mac,
-		struct roam_offload_synch_ind *roam_synch_ind_ptr,
-		tpSirBssDescription  bss_desc_ptr);
+/**
+ * csr_scan_save_roam_offload_ap_to_scan_cache() - This function parses the
+ * received beacon/probe response from the firmware as part of the roam synch
+ * indication. The beacon or the probe response is parsed and is also
+ * saved into the scan cache
+ *
+ * @mac:  mac Pointer to Global Mac
+ * @roam_sync_ind_ptr:  Roam Synch Indication from firmware
+ *
+ * @Return QDF_STATUS
+ */
+QDF_STATUS
+csr_rso_save_ap_to_scan_cache(struct mac_context *mac,
+			      struct roam_offload_synch_ind *roam_synch_ind,
+			      struct bss_description *bss_desc_ptr);
+
 void csr_process_ho_fail_ind(struct mac_context *mac, void *pMsgBuf);
 #endif
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR

core/sme/inc/csr_neighbor_roam.h

@@ -78,7 +78,7 @@ typedef struct sCsrNeighborRoamChannelInfo {
 typedef struct sCsrNeighborRoamBSSInfo {
 	tListElem List;
 	uint8_t apPreferenceVal;
-	tpSirBssDescription pBssDescription;
+	struct bss_description *pBssDescription;
 } tCsrNeighborRoamBSSInfo, *tpCsrNeighborRoamBSSInfo;
 
 #define CSR_NEIGHBOR_ROAM_REPORT_QUERY_TIMEOUT  1000       /* in milliseconds */
@@ -360,11 +360,11 @@ QDF_STATUS csr_roam_read_tsf(struct mac_context *mac, uint8_t *pTimestamp,
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 QDF_STATUS csr_roam_synch_callback(struct mac_context *mac,
 	struct roam_offload_synch_ind *roam_synch_data,
-	tpSirBssDescription  bss_desc_ptr, enum sir_roam_op_code reason);
+	struct bss_description *bss_desc_ptr, enum sir_roam_op_code reason);
 #else
 static inline QDF_STATUS csr_roam_synch_callback(struct mac_context *mac,
 	struct roam_offload_synch_ind *roam_synch_data,
-	tpSirBssDescription  bss_desc_ptr, enum sir_roam_op_code reason)
+	struct bss_description *bss_desc_ptr, enum sir_roam_op_code reason)
 {
 	return QDF_STATUS_E_NOSUPPORT;
 }

core/sme/src/csr/csr_api_roam.c

@@ -128,7 +128,7 @@
  * @Return: total IE length
  */
 static inline uint16_t
-csr_get_ielen_from_bss_description(tpSirBssDescription pBssDescr)
+csr_get_ielen_from_bss_description(struct bss_description *pBssDescr)
 {
 	uint16_t ielen;
 
@@ -2172,7 +2172,7 @@ QDF_STATUS csr_roam_read_tsf(struct mac_context *mac, uint8_t *pTimestamp,
 	tCsrNeighborRoamBSSInfo handoffNode = {{0} };
 	uint64_t timer_diff = 0;
 	uint32_t timeStamp[2];
-	tpSirBssDescription pBssDescription = NULL;
+	struct bss_description *pBssDescription = NULL;
 
 	csr_neighbor_roam_get_handoff_ap_info(mac, &handoffNode, sessionId);
 	if (!handoffNode.pBssDescription) {
@@ -20878,7 +20878,7 @@ void csr_update_fils_erp_seq_num(struct csr_roam_profile *roam_profile,
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 static QDF_STATUS csr_process_roam_sync_callback(struct mac_context *mac_ctx,
 		struct roam_offload_synch_ind *roam_synch_data,
-		tpSirBssDescription bss_desc, enum sir_roam_op_code reason)
+		struct bss_description *bss_desc, enum sir_roam_op_code reason)
 {
 	uint8_t session_id = roam_synch_data->roamed_vdev_id;
 	struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id);
@@ -21012,8 +21012,7 @@ static QDF_STATUS csr_process_roam_sync_callback(struct mac_context *mac_ctx,
 		qdf_mem_free(ies_local);
 		return QDF_STATUS_E_NOMEM;
 	}
-	csr_scan_save_roam_offload_ap_to_scan_cache(mac_ctx, roam_synch_data,
-						    bss_desc);
+	csr_rso_save_ap_to_scan_cache(mac_ctx, roam_synch_data, bss_desc);
 	roam_info->sessionId = session_id;
 
 	qdf_mem_copy(&roam_info->bssid.bytes, &bss_desc->bssId,
@@ -21286,9 +21285,11 @@ static QDF_STATUS csr_process_roam_sync_callback(struct mac_context *mac_ctx,
  *
  * Return: Success or Failure.
  */
-QDF_STATUS csr_roam_synch_callback(struct mac_context *mac_ctx,
-		struct roam_offload_synch_ind *roam_synch_data,
-		tpSirBssDescription  bss_desc, enum sir_roam_op_code reason)
+QDF_STATUS
+csr_roam_synch_callback(struct mac_context *mac_ctx,
+			struct roam_offload_synch_ind *roam_synch_data,
+			struct bss_description *bss_desc,
+			enum sir_roam_op_code reason)
 {
 	QDF_STATUS status;
 

core/sme/src/csr/csr_api_scan.c

@@ -1835,23 +1835,11 @@ void update_cckmtsf(uint32_t *timeStamp0, uint32_t *timeStamp1,
 }
 #endif
 
-/**
- * csr_scan_save_roam_offload_ap_to_scan_cache
- * This function parses the received beacon/probe response
- * from the firmware as part of the roam synch indication.
- * The beacon or the probe response is parsed and is also
- * saved into the scan cache
- *
- * @param  mac Pointer to Global Mac
- * @param  roam_sync_ind_ptr Roam Synch Indication from
- *         firmware which also contains the beacon/probe
- *         response
- * @return Status
- */
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
-QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(struct mac_context *mac,
-				struct roam_offload_synch_ind *roam_sync_ind_ptr,
-				tpSirBssDescription  bss_desc_ptr)
+QDF_STATUS
+csr_rso_save_ap_to_scan_cache(struct mac_context *mac,
+			      struct roam_offload_synch_ind *roam_sync_ind_ptr,
+			      struct bss_description *bss_desc_ptr)
 {
 	uint32_t length = 0;
 	struct tag_csrscan_result *scan_res_ptr = NULL;
@@ -1882,7 +1870,8 @@ QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(struct mac_context *mac,
  *
  * Return: first bss descriptor from the scan handle.
  */
-tpSirBssDescription csr_get_fst_bssdescr_ptr(tScanResultHandle result_handle)
+struct bss_description*
+csr_get_fst_bssdescr_ptr(tScanResultHandle result_handle)
 {
 	tListElem *first_element = NULL;
 	struct tag_csrscan_result *scan_result = NULL;

core/sme/src/csr/csr_inside_api.h

@@ -842,8 +842,9 @@ void update_cckmtsf(uint32_t *timeStamp0, uint32_t *timeStamp1,
 #endif
 
 QDF_STATUS csr_roam_enqueue_preauth(struct mac_context *mac, uint32_t sessionId,
-			    tpSirBssDescription pBssDescription,
-			    enum csr_roam_reason reason, bool fImmediate);
+				    struct bss_description *pBssDescription,
+				    enum csr_roam_reason reason,
+				    bool fImmediate);
 QDF_STATUS csr_dequeue_roam_command(struct mac_context *mac,
 				enum csr_roam_reason reason,
 				uint8_t session_id);
@@ -891,7 +892,8 @@ QDF_STATUS csr_scan_handle_search_for_ssid_failure(struct mac_context *mac,
 		uint32_t session_id);
 void csr_saved_scan_cmd_free_fields(struct mac_context *mac_ctx,
 				    struct csr_roam_session *session);
-tpSirBssDescription csr_get_fst_bssdescr_ptr(tScanResultHandle result_handle);
+struct bss_description*
+csr_get_fst_bssdescr_ptr(tScanResultHandle result_handle);
 
 tSirBssDescription*
 csr_get_bssdescr_from_scan_handle(tScanResultHandle result_handle,

core/sme/src/csr/csr_roam_preauth.c

@@ -102,8 +102,9 @@ void csr_neighbor_roam_tranistion_preauth_done_to_disconnected(
  * Return: Success if queued properly, false otherwise.
  */
 QDF_STATUS csr_roam_enqueue_preauth(struct mac_context *mac_ctx,
-		uint32_t session_id, tpSirBssDescription bss_desc,
-		enum csr_roam_reason reason, bool immediate)
+				    uint32_t session_id,
+				    struct bss_description *bss_desc,
+				    enum csr_roam_reason reason, bool immediate)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	tSmeCmd *command;
@@ -447,7 +448,7 @@ bool csr_neighbor_roam_is_preauth_candidate(struct mac_context *mac,
  */
 static uint32_t csr_get_dot11_mode(struct mac_context *mac_ctx,
 				   uint32_t session_id,
-				   tpSirBssDescription bss_desc)
+				   struct bss_description *bss_desc)
 {
 	struct csr_roam_session *csr_session = CSR_GET_SESSION(mac_ctx,
 				session_id);
@@ -506,11 +507,11 @@ static uint32_t csr_get_dot11_mode(struct mac_context *mac_ctx,
 
 QDF_STATUS csr_roam_issue_ft_preauth_req(struct mac_context *mac_ctx,
 					 uint32_t session_id,
-					 tpSirBssDescription bss_desc)
+					 struct bss_description *bss_desc)
 {
 	tpSirFTPreAuthReq preauth_req;
 	uint16_t auth_req_len;
-	tpSirBssDescription buf;
+	struct bss_description *buf;
 	uint32_t dot11mode, buf_len;
 	QDF_STATUS status;
 	struct csr_roam_session *csr_session = CSR_GET_SESSION(mac_ctx,

core/sme/src/rrm/sme_rrm.c

@@ -163,7 +163,7 @@ sme_rrm_send_beacon_report_xmit_ind(struct mac_context *mac_ctx,
 	tCsrScanResultInfo **result_arr, uint8_t msrmnt_status,
 	uint8_t bss_count)
 {
-	tpSirBssDescription bss_desc = NULL;
+	struct bss_description *bss_desc = NULL;
 	tpSirBeaconReportXmitInd beacon_rep;
 	uint16_t length;
 	uint32_t size;
@@ -171,7 +171,7 @@ sme_rrm_send_beacon_report_xmit_ind(struct mac_context *mac_ctx,
 	tCsrScanResultInfo *cur_result = NULL;
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpRrmSMEContext rrm_ctx = &mac_ctx->rrm.rrmSmeContext;
-	tpSirBssDescription bss_desc_to_free[SIR_BCN_REPORT_MAX_BSS_DESC] = {0};
+	struct bss_description *tmp_bss_desc[SIR_BCN_REPORT_MAX_BSS_DESC] = {0};
 
 	if (NULL == result_arr && !msrmnt_status) {
 		sme_err("Beacon report xmit Ind to PE Failed");
@@ -207,7 +207,7 @@ sme_rrm_send_beacon_report_xmit_ind(struct mac_context *mac_ctx,
 				break;
 			qdf_mem_copy(beacon_rep->pBssDescription[i],
 				bss_desc, size);
-			bss_desc_to_free[i] =
+			tmp_bss_desc[i] =
 				beacon_rep->pBssDescription[i];
 			sme_debug("RRM Result Bssid = " MAC_ADDRESS_STR
 				" chan= %d, rssi = -%d",
@@ -240,7 +240,7 @@ sme_rrm_send_beacon_report_xmit_ind(struct mac_context *mac_ctx,
 		status = umac_send_mb_message_to_mac(beacon_rep);
 		if (status != QDF_STATUS_SUCCESS)
 			for (counter = 0; counter < i; ++counter)
-				qdf_mem_free(bss_desc_to_free[counter]);
+				qdf_mem_free(tmp_bss_desc[counter]);
 	} while (cur_result);
 
 	return status;
@@ -270,7 +270,7 @@ static QDF_STATUS sme_ese_send_beacon_req_scan_results(
 {
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	QDF_STATUS fill_ie_status;
-	tpSirBssDescription bss_desc = NULL;
+	struct bss_description *bss_desc = NULL;
 	uint32_t ie_len = 0;
 	uint32_t out_ie_len = 0;
 	uint8_t bss_counter = 0;

core/wma/inc/wma.h

@@ -1199,11 +1199,11 @@ typedef struct {
 
 	QDF_STATUS (*csr_roam_synch_cb)(struct mac_context *mac,
 		struct roam_offload_synch_ind *roam_synch_data,
-		tpSirBssDescription  bss_desc_ptr,
+		struct bss_description *bss_desc_ptr,
 		enum sir_roam_op_code reason);
 	QDF_STATUS (*pe_roam_synch_cb)(struct mac_context *mac,
 		struct roam_offload_synch_ind *roam_synch_data,
-		tpSirBssDescription  bss_desc_ptr,
+		struct bss_description *bss_desc_ptr,
 		enum sir_roam_op_code reason);
 	qdf_wake_lock_t wmi_cmd_rsp_wake_lock;
 	qdf_runtime_lock_t wmi_cmd_rsp_runtime_lock;

core/wma/inc/wma_types.h

@@ -731,21 +731,21 @@ QDF_STATUS wma_de_register_mgmt_frm_client(void);
 QDF_STATUS wma_register_roaming_callbacks(
 		QDF_STATUS (*csr_roam_synch_cb)(struct mac_context *mac,
 			struct roam_offload_synch_ind *roam_synch_data,
-			tpSirBssDescription  bss_desc_ptr,
+			struct bss_description *bss_desc_ptr,
 			enum sir_roam_op_code reason),
 		QDF_STATUS (*pe_roam_synch_cb)(struct mac_context *mac,
 			struct roam_offload_synch_ind *roam_synch_data,
-			tpSirBssDescription  bss_desc_ptr,
+			struct bss_description *bss_desc_ptr,
 			enum sir_roam_op_code reason));
 #else
 static inline QDF_STATUS wma_register_roaming_callbacks(
 		QDF_STATUS (*csr_roam_synch_cb)(struct mac_context *mac,
 			struct roam_offload_synch_ind *roam_synch_data,
-			tpSirBssDescription  bss_desc_ptr,
+			struct bss_description *bss_desc_ptr,
 			enum sir_roam_op_code reason),
 		QDF_STATUS (*pe_roam_synch_cb)(struct mac_context *mac,
 			struct roam_offload_synch_ind *roam_synch_data,
-			tpSirBssDescription  bss_desc_ptr,
+			struct bss_description *bss_desc_ptr,
 			enum sir_roam_op_code reason))
 {
 	return QDF_STATUS_E_NOSUPPORT;

core/wma/src/wma_mgmt.c

@@ -4368,11 +4368,11 @@ QDF_STATUS wma_de_register_mgmt_frm_client(void)
 QDF_STATUS wma_register_roaming_callbacks(
 	QDF_STATUS (*csr_roam_synch_cb)(struct mac_context *mac,
 		struct roam_offload_synch_ind *roam_synch_data,
-		tpSirBssDescription  bss_desc_ptr,
+		struct bss_description *bss_desc_ptr,
 		enum sir_roam_op_code reason),
 	QDF_STATUS (*pe_roam_synch_cb)(struct mac_context *mac,
 		struct roam_offload_synch_ind *roam_synch_data,
-		tpSirBssDescription  bss_desc_ptr,
+		struct bss_description *bss_desc_ptr,
 		enum sir_roam_op_code reason))
 {
 

core/wma/src/wma_scan_roam.c

@@ -2407,7 +2407,7 @@ int wma_roam_synch_event_handler(void *handle, uint8_t *event,
 	wmi_roam_synch_event_fixed_param *synch_event = NULL;
 	tp_wma_handle wma = (tp_wma_handle) handle;
 	struct roam_offload_synch_ind *roam_synch_ind_ptr = NULL;
-	tpSirBssDescription  bss_desc_ptr = NULL;
+	struct bss_description *bss_desc_ptr = NULL;
 	uint8_t channel;
 	uint16_t ie_len = 0;
 	int status = -EINVAL;