qcacld-3.0: Replace typedef tSirBssDescription

The linux coding style forbids use of typedef unless clearly
some rules are met. The tSirBssDescription doesn't match any of
those criteria, so replace it with underlying structure
bss_description.

Change-Id: I36ad517325117cf04d499c7c472ca6ef5921a85d
CRs-Fixed: 2459769

core/mac/inc/sir_api.h

@@ -622,8 +622,8 @@ struct start_bss_req {
 };
 
 #define GET_IE_LEN_IN_BSS(lenInBss) (lenInBss + sizeof(lenInBss) - \
-				    ((uintptr_t)OFFSET_OF(tSirBssDescription,\
-							  ieFields)))
+			    ((uintptr_t)OFFSET_OF(struct bss_description,\
+						  ieFields)))
 
 #define WSCIE_PROBE_RSP_LEN (317 + 2)
 
@@ -694,7 +694,6 @@ struct bss_description {
 	/* Please keep the structure 4 bytes aligned above the ieFields */
 	uint32_t ieFields[1];
 };
-typedef struct bss_description tSirBssDescription;
 
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
 struct ht_profile {
@@ -722,7 +721,7 @@ struct start_bss_rsp {
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
 	struct ht_profile ht_profile;
 #endif
-	tSirBssDescription bssDescription;      /* Peer BSS description */
+	struct bss_description bssDescription;      /* Peer BSS description */
 };
 
 struct report_channel_list {
@@ -976,7 +975,7 @@ struct join_req {
 	uint8_t nss;
 	bool nss_forced_1x1;
 	bool enable_session_twt_support;
-	tSirBssDescription bssDescription;
+	struct bss_description bssDescription;
 	/*
 	 * WARNING: Pls make bssDescription as last variable in struct
 	 * join_req as it has ieFields followed after this bss

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

@@ -163,7 +163,7 @@ typedef struct sLimMlmAuthReq {
 typedef struct sLimMlmJoinReq {
 	tSirMacRateSet operationalRateSet;
 	uint8_t sessionId;
-	tSirBssDescription bssDescription;
+	struct bss_description bssDescription;
 	/*
 	 * WARNING: Pls make bssDescription as last variable in struct
 	 * tLimMlmJoinReq as it has ieFields followed after this bss

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

@@ -1965,14 +1965,14 @@ lim_roam_fill_bss_descr(struct mac_context *mac,
 	 * length itself and length of pointer
 	 * that holds ieFields
 	 *
-	 * tSirBssDescription
+	 * struct bss_description
 	 * +--------+---------------------------------+---------------+
 	 * | length | other fields                    | pointer to IEs|
 	 * +--------+---------------------------------+---------------+
 	 *                                            ^
 	 *                                            ieFields
 	 */
-	bss_desc_ptr->length = (uint16_t) (offsetof(tSirBssDescription,
+	bss_desc_ptr->length = (uint16_t) (offsetof(struct bss_description,
 					   ieFields[0]) -
 				sizeof(bss_desc_ptr->length) + ie_len);
 

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

@@ -658,7 +658,7 @@ __lim_ext_scan_forward_bcn_probe_rsp(struct mac_context *pmac, uint8_t *rx_pkt_i
 	struct scheduler_msg         mmh_msg = {0};
 	tpSirMacMgmtHdr              hdr;
 	uint32_t frame_len;
-	tSirBssDescription *bssdescr;
+	struct bss_description *bssdescr;
 
 	result = qdf_mem_malloc(sizeof(*result) + ie_len);
 	if (!result)

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

@@ -2999,7 +2999,7 @@ static void lim_process_switch_channel_join_req(
 	tSirMacSSid ssId;
 	tLimMlmJoinCnf join_cnf;
 	uint8_t nontx_bss_id = 0;
-	tSirBssDescription *bss;
+	struct bss_description *bss;
 
 	if (status != QDF_STATUS_SUCCESS) {
 		pe_err("Change channel failed!!");

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

@@ -1229,7 +1229,7 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
 	int8_t local_power_constraint = 0, reg_max = 0;
 	uint16_t ie_len;
 	const uint8_t *vendor_ie;
-	tSirBssDescription *bss_desc;
+	struct bss_description *bss_desc;
 	QDF_STATUS status;
 	struct lim_max_tx_pwr_attr tx_pwr_attr = {0};
 
@@ -1366,7 +1366,7 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
 
 		/* Store vendor specific IE for CISCO AP */
 		ie_len = (bss_desc->length + sizeof(bss_desc->length) -
-			 GET_FIELD_OFFSET(tSirBssDescription, ieFields));
+			 GET_FIELD_OFFSET(struct bss_description, ieFields));
 
 		vendor_ie = wlan_get_vendor_ie_ptr_from_oui(
 				SIR_MAC_CISCO_OUI, SIR_MAC_CISCO_OUI_SIZE,

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

@@ -62,7 +62,7 @@
  */
 void
 lim_collect_bss_description(struct mac_context *mac,
-			    tSirBssDescription *pBssDescr,
+			    struct bss_description *pBssDescr,
 			    tpSirProbeRespBeacon pBPR,
 			    uint8_t *pRxPacketInfo, uint8_t fScanning)
 {
@@ -90,15 +90,16 @@ lim_collect_bss_description(struct mac_context *mac,
 	 * Length of BSS desription is without length of
 	 * length itself and length of pointer that holds ieFields.
 	 *
-	 * tSirBssDescription
+	 * struct bss_description
 	 * +--------+---------------------------------+---------------+
 	 * | length | other fields                    | pointer to IEs|
 	 * +--------+---------------------------------+---------------+
 	 *                                            ^
 	 *                                            ieFields
 	 */
-	pBssDescr->length = (uint16_t)(offsetof(tSirBssDescription, ieFields[0])
-					- sizeof(pBssDescr->length) + ieLen);
+	pBssDescr->length =
+		(uint16_t)(offsetof(struct bss_description, ieFields[0]) -
+			   sizeof(pBssDescr->length) + ieLen);
 
 	/* Copy BSS Id */
 	qdf_mem_copy((uint8_t *) &pBssDescr->bssId,

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

@@ -33,7 +33,7 @@
 
 /* Scan result hash related functions */
 void lim_collect_bss_description(struct mac_context *mac,
-			    tSirBssDescription *pBssDescr,
+			    struct bss_description *pBssDescr,
 			    tpSirProbeRespBeacon pBPR,
 			    uint8_t *pRxPacketInfo, uint8_t fScanning);
 #endif /* __LIM_SCAN_UTILS_H */

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

@@ -1906,7 +1906,7 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
 	}
 
 	if (pe_session->pLimJoinReq->is11Rconnection) {
-		tSirBssDescription *bssdescr;
+		struct bss_description *bssdescr;
 
 		bssdescr = &pe_session->pLimJoinReq->bssDescription;
 		pe_debug("mdie = %02x %02x %02x",

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

@@ -564,7 +564,7 @@ void lim_send_sme_start_bss_rsp(struct mac_context *mac,
 				     schBeaconOffsetEnd);
 
 			pSirSmeRsp->bssDescription.length = (uint16_t)
-				(offsetof(tSirBssDescription, ieFields[0])
+				(offsetof(struct bss_description, ieFields[0])
 				- sizeof(pSirSmeRsp->bssDescription.length)
 				+ ieLen);
 			/* This is the size of the message, subtracting the size of the pointer to ieFields */

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

@@ -838,7 +838,7 @@ lim_post_mlm_message(struct mac_context *mac, uint32_t msgType, uint32_t *pMsgBu
  *
  ***FUNCTION:
  * This function is called in various places to get IE length
- * from tSirBssDescription structure
+ * from struct bss_description structure
  * number being scanned.
  *
  ***PARAMS:
@@ -868,7 +868,7 @@ lim_get_ielen_from_bss_description(struct bss_description *pBssDescr)
 	 * length itself and length of pointer
 	 * that holds ieFields
 	 *
-	 * <------------sizeof(tSirBssDescription)-------------------->
+	 * <------------sizeof(struct bss_description)-------------------->
 	 * +--------+---------------------------------+---------------+
 	 * | length | other fields                    | pointer to IEs|
 	 * +--------+---------------------------------+---------------+
@@ -877,7 +877,7 @@ lim_get_ielen_from_bss_description(struct bss_description *pBssDescr)
 	 */
 
 	ielen = (uint16_t)(pBssDescr->length + sizeof(pBssDescr->length) -
-			   GET_FIELD_OFFSET(tSirBssDescription, ieFields));
+			   GET_FIELD_OFFSET(struct bss_description, ieFields));
 
 	return ielen;
 } /*** end lim_get_ielen_from_bss_description() ***/

core/sme/inc/csr_api.h

@@ -231,9 +231,9 @@ typedef struct tagCsrScanResultInfo {
 	unsigned long timer;           /* timer is variable for hidden SSID timer */
 	/*
 	 * This member must be the last in the structure because the
-	 * end of tSirBssDescription is an
+	 * end of struct bss_description is an
 	 * array with nonknown size at this time */
-	tSirBssDescription BssDescriptor;
+	struct bss_description BssDescriptor;
 } tCsrScanResultInfo;
 
 typedef struct tagCsrEncryptionList {
@@ -349,7 +349,7 @@ typedef enum {
 	/*
 	 * an association or start_IBSS operation starts,
 	 * callback may get a pointer to struct csr_roam_profile and
-	 * a pointer to tSirBssDescription
+	 * a pointer to struct bss_description
 	 */
 	eCSR_ROAM_ASSOCIATION_START,
 	/*
@@ -881,7 +881,7 @@ typedef struct tagCsrRoamConnectedProfile {
 	 * which can be WSC IE and/or P2P IE
 	 */
 	uint8_t *pAddIEAssoc;
-	tSirBssDescription *pBssDesc;
+	struct bss_description *pBssDesc;
 	bool qap;               /* AP supports QoS */
 	struct mobility_domain_info mdid;
 #ifdef FEATURE_WLAN_ESE
@@ -1054,7 +1054,7 @@ struct csr_config_params {
 
 struct csr_roam_info {
 	struct csr_roam_profile *pProfile;
-	tSirBssDescription *pBssDesc;
+	struct bss_description *pBssDesc;
 	uint32_t nBeaconLength;
 	uint32_t nAssocReqLength;
 	uint32_t nAssocRspLength;

core/sme/inc/csr_internal.h

@@ -278,7 +278,9 @@ struct roam_cmd {
 	 * It starts from head to tail
 	 * */
 	tListElem *pRoamBssEntry;
-	tSirBssDescription *pLastRoamBss; /* the last BSS we try and failed */
+
+	/* the last BSS we try and failed */
+	struct bss_description *pLastRoamBss;
 	bool fReleaseBssList;             /* whether to free hBSSList */
 	bool fReleaseProfile;             /* whether to free roamProfile */
 	bool fReassoc;                    /* whether this cmd is for reassoc */
@@ -586,7 +588,7 @@ struct csr_roam_session {
 	struct csr_roam_connectedinfo connectedInfo;
 	struct csr_roam_connectedinfo prev_assoc_ap_info;
 	struct csr_roam_profile *pCurRoamProfile;
-	tSirBssDescription *pConnectBssDesc;
+	struct bss_description *pConnectBssDesc;
 	uint16_t NumPmkidCache; /* valid number of pmkid in the cache*/
 	uint16_t curr_cache_idx; /* the index in pmkidcache to write next to */
 	tPmkidCacheInfo PmkidCacheInfo[CSR_MAX_PMKID_ALLOWED];
@@ -937,8 +939,8 @@ uint8_t csr_get_connected_infra(struct mac_context *mac_ctx);
 bool csr_is_concurrent_session_running(struct mac_context *mac);
 bool csr_is_infra_ap_started(struct mac_context *mac);
 bool csr_is_valid_mc_concurrent_session(struct mac_context *mac,
-							 uint32_t sessionId,
-						tSirBssDescription *pBssDesc);
+					uint32_t sessionId,
+					struct bss_description *pBssDesc);
 bool csr_is_conn_state_connected_infra_ap(struct mac_context *mac,
 		uint32_t sessionId);
 QDF_STATUS csr_get_statistics(struct mac_context *mac,
@@ -965,7 +967,7 @@ QDF_STATUS csr_ready(struct mac_context *mac);
 #ifdef FEATURE_WLAN_WAPI
 uint8_t csr_construct_wapi_ie(struct mac_context *mac, uint32_t sessionId,
 		struct csr_roam_profile *pProfile,
-		tSirBssDescription *pSirBssDesc,
+		struct bss_description *pSirBssDesc,
 		tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe);
 #endif /* FEATURE_WLAN_WAPI */
 

core/sme/inc/csr_neighbor_roam.h

@@ -170,7 +170,7 @@ void csr_neighbor_roam_free_roamable_bss_list(struct mac_context *mac_ctx,
 bool csr_neighbor_roam_get_handoff_ap_info(struct mac_context *mac,
 		tpCsrNeighborRoamBSSInfo pHandoffNode, uint8_t sessionId);
 QDF_STATUS csr_roam_issue_reassociate(struct mac_context *mac,
-		uint32_t sessionId, tSirBssDescription *pSirBssDesc,
+		uint32_t sessionId, struct bss_description *pSirBssDesc,
 		tDot11fBeaconIEs *pIes, struct csr_roam_profile *pProfile);
 void csr_neighbor_roam_request_handoff(struct mac_context *mac, uint8_t sessionId);
 QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(struct mac_context *mac,
@@ -194,7 +194,7 @@ static inline QDF_STATUS csr_roam_issue_reassociate_cmd(struct mac_context *mac,
 	return QDF_STATUS_E_NOSUPPORT;
 }
 static inline QDF_STATUS csr_roam_issue_reassociate(struct mac_context *mac,
-		uint32_t sessionId, tSirBssDescription *pSirBssDesc,
+		uint32_t sessionId, struct bss_description *pSirBssDesc,
 		tDot11fBeaconIEs *pIes, struct csr_roam_profile *pProfile)
 {
 	return QDF_STATUS_E_NOSUPPORT;

core/sme/inc/csr_support.h

@@ -217,17 +217,20 @@ struct csr_timer_info {
 	 ((pIes)->WMMParams.qosInfo & SME_QOS_AP_SUPPORTS_APSD)) || \
 	 ((pIes)->WMMInfoAp.present && (pIes)->WMMInfoAp.uapsd))
 
-bool csr_get_bss_id_bss_desc(tSirBssDescription *pSirBssDesc,
+bool csr_get_bss_id_bss_desc(struct bss_description *pSirBssDesc,
 			     struct qdf_mac_addr *pBssId);
-bool csr_is_bss_id_equal(tSirBssDescription *pSirBssDesc1,
-			 tSirBssDescription *pSirBssDesc2);
-eCsrMediaAccessType csr_get_qos_from_bss_desc(struct mac_context *mac_ctx,
-					      tSirBssDescription *pSirBssDesc,
-					      tDot11fBeaconIEs *pIes);
+bool csr_is_bss_id_equal(struct bss_description *pSirBssDesc1,
+			 struct bss_description *pSirBssDesc2);
+
+eCsrMediaAccessType
+csr_get_qos_from_bss_desc(struct mac_context *mac_ctx,
+			  struct bss_description *pSirBssDesc,
+			  tDot11fBeaconIEs *pIes);
+
 bool csr_is_nullssid(uint8_t *pBssSsid, uint8_t len);
-bool csr_is_infra_bss_desc(tSirBssDescription *pSirBssDesc);
-bool csr_is_ibss_bss_desc(tSirBssDescription *pSirBssDesc);
-bool csr_is_privacy(tSirBssDescription *pSirBssDesc);
+bool csr_is_infra_bss_desc(struct bss_description *pSirBssDesc);
+bool csr_is_ibss_bss_desc(struct bss_description *pSirBssDesc);
+bool csr_is_privacy(struct bss_description *pSirBssDesc);
 tSirResultCodes csr_get_de_auth_rsp_status_code(struct deauth_rsp *pSmeRsp);
 uint32_t csr_get_frag_thresh(struct mac_context *mac_ctx);
 uint32_t csr_get_rts_thresh(struct mac_context *mac_ctx);
@@ -235,12 +238,12 @@ uint32_t csr_get11h_power_constraint(struct mac_context *mac_ctx,
 				     tDot11fIEPowerConstraints *constraints);
 uint8_t csr_construct_rsn_ie(struct mac_context *mac, uint32_t sessionId,
 			     struct csr_roam_profile *pProfile,
-			     tSirBssDescription *pSirBssDesc,
+			     struct bss_description *pSirBssDesc,
 			     tDot11fBeaconIEs *pIes, tCsrRSNIe *pRSNIe);
 
 uint8_t csr_construct_wpa_ie(struct mac_context *mac, uint8_t session_id,
 			     struct csr_roam_profile *pProfile,
-			     tSirBssDescription *pSirBssDesc,
+			     struct bss_description *pSirBssDesc,
 			     tDot11fBeaconIEs *pIes, tCsrWpaIe *pWpaIe);
 
 #ifdef FEATURE_WLAN_WAPI
@@ -253,12 +256,12 @@ bool csr_is_profile_wapi(struct csr_roam_profile *pProfile);
  */
 uint8_t csr_retrieve_wpa_ie(struct mac_context *mac, uint8_t session_id,
 			    struct csr_roam_profile *pProfile,
-			    tSirBssDescription *pSirBssDesc,
+			    struct bss_description *pSirBssDesc,
 			    tDot11fBeaconIEs *pIes, tCsrWpaIe *pWpaIe);
 
 bool csr_is_ssid_equal(struct mac_context *mac,
-		       tSirBssDescription *pSirBssDesc1,
-		       tSirBssDescription *pSirBssDesc2,
+		       struct bss_description *pSirBssDesc1,
+		       struct bss_description *pSirBssDesc2,
 		       tDot11fBeaconIEs *pIes2);
 
 /* Null ssid means match */
@@ -272,7 +275,7 @@ bool csr_is_profile_rsn(struct csr_roam_profile *pProfile);
  */
 uint8_t csr_retrieve_rsn_ie(struct mac_context *mac, uint32_t sessionId,
 			    struct csr_roam_profile *pProfile,
-			    tSirBssDescription *pSirBssDesc,
+			    struct bss_description *pSirBssDesc,
 			    tDot11fBeaconIEs *pIes, tCsrRSNIe *pRsnIe);
 #ifdef FEATURE_WLAN_WAPI
 /*
@@ -282,7 +285,7 @@ uint8_t csr_retrieve_rsn_ie(struct mac_context *mac, uint32_t sessionId,
  */
 uint8_t csr_retrieve_wapi_ie(struct mac_context *mac, uint32_t sessionId,
 			     struct csr_roam_profile *pProfile,
-			     tSirBssDescription *pSirBssDesc,
+			     struct bss_description *pSirBssDesc,
 			     tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe);
 #endif /* FEATURE_WLAN_WAPI */
 bool csr_rates_is_dot11_rate11b_supported_rate(uint8_t dot11Rate);
@@ -297,7 +300,7 @@ bool csr_is_security_match(struct mac_context *mac_ctx, tCsrAuthList *auth_type,
 			   tCsrEncryptionList *uc_enc_type,
 			   tCsrEncryptionList *mc_enc_type, bool *mfp_enabled,
 			   uint8_t *mfp_required, uint8_t *mfp_capable,
-			   tSirBssDescription *bss_desc,
+			   struct bss_description *bss_desc,
 			   tDot11fBeaconIEs *ies_ptr, uint8_t session_id);
 bool csr_is_bss_type_ibss(eCsrRoamBssType bssType);
 bool csr_is_bssid_match(struct qdf_mac_addr *pProfBssid,
@@ -308,7 +311,7 @@ bool csr_rates_is_dot11_rate_supported(struct mac_context *mac_ctx, uint8_t rate
 enum bss_type csr_translate_bsstype_to_mac_type(eCsrRoamBssType csrtype);
 /* Caller allocates memory for pIEStruct */
 QDF_STATUS csr_parse_bss_description_ies(struct mac_context *mac_ctx,
-					 tSirBssDescription *pBssDesc,
+					 struct bss_description *pBssDesc,
 					 tDot11fBeaconIEs *pIEStruct);
 /*
  * This function will allocate memory for the parsed IEs to the caller.
@@ -316,13 +319,13 @@ QDF_STATUS csr_parse_bss_description_ies(struct mac_context *mac_ctx,
  * this function succeeds
  */
 QDF_STATUS csr_get_parsed_bss_description_ies(struct mac_context *mac_ctx,
-					      tSirBssDescription *pBssDesc,
+					      struct bss_description *pBssDesc,
 					      tDot11fBeaconIEs **ppIEStruct);
 
 tSirScanType csr_get_scan_type(struct mac_context *mac, uint8_t chnId);
 
 QDF_STATUS csr_get_phy_mode_from_bss(struct mac_context *mac,
-		tSirBssDescription *pBSSDescription,
+		struct bss_description *pBSSDescription,
 		eCsrPhyMode *pPhyMode, tDot11fBeaconIEs *pIes);
 /*
  * fForce -- force reassoc regardless of whether there is any change.

core/sme/inc/sme_nan_datapath.h

@@ -35,7 +35,7 @@ QDF_STATUS csr_roam_start_ndi(struct mac_context *mac_ctx, uint32_t session_id,
 void csr_roam_save_ndi_connected_info(struct mac_context *mac_ctx,
 				      uint32_t session_id,
 				      struct csr_roam_profile *roam_profile,
-				      tSirBssDescription *bss_desc);
+				      struct bss_description *bss_desc);
 
 void csr_roam_update_ndp_return_params(struct mac_context *mac_ctx,
 					uint32_t result,
@@ -55,7 +55,7 @@ static inline QDF_STATUS csr_roam_start_ndi(struct mac_context *mac_ctx,
 static inline void csr_roam_save_ndi_connected_info(struct mac_context *mac_ctx,
 					uint32_t session_id,
 					struct csr_roam_profile *roam_profile,
-					tSirBssDescription *bss_desc)
+					struct bss_description *bss_desc)
 {
 }
 

core/sme/inc/sme_qos_internal.h

@@ -83,7 +83,7 @@ typedef enum {
   reassoc is done
   ---------------------------------------------------------------------------*/
 typedef struct {
-	tSirBssDescription *pBssDesc;
+	struct bss_description *pBssDesc;
 	struct csr_roam_profile *pProfile;
 } sme_QosAssocInfo;
 
@@ -102,7 +102,7 @@ QDF_STATUS sme_qos_csr_event_ind(struct mac_context *mac,
 		uint8_t sessionId,
 		sme_qos_csr_event_indType ind, void *pEvent_info);
 uint8_t sme_qos_get_acm_mask(struct mac_context *mac,
-		tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes);
+		struct bss_description *pSirBssDesc, tDot11fBeaconIEs *pIes);
 #ifdef FEATURE_WLAN_ESE
 uint8_t sme_qos_ese_retrieve_tspec_info(struct mac_context *mac, uint8_t sessionId,
 		tTspecInfo * pTspecInfo);

core/sme/src/common/sme_api.c

@@ -2599,7 +2599,7 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(
 	struct mac_context *mac_ctx = sme_get_mac_context();
 	tCsrScanResultFilter *scan_filter = NULL;
 	tScanResultHandle filtered_scan_result = NULL;
-	tSirBssDescription first_ap_profile;
+	struct bss_description first_ap_profile;
 
 	if (!mac_ctx) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
@@ -2610,7 +2610,7 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(
 	if (!scan_filter)
 		return QDF_STATUS_E_FAILURE;
 
-	qdf_mem_zero(&first_ap_profile, sizeof(tSirBssDescription));
+	qdf_mem_zero(&first_ap_profile, sizeof(struct bss_description));
 	if (!profile) {
 		scan_filter->EncryptionType.numEntries = 1;
 		scan_filter->EncryptionType.encryptionType[0]
@@ -13605,7 +13605,7 @@ QDF_STATUS sme_set_wow_pulse(struct wow_pulse_mode *wow_pulse_set_info)
  * Return: None
  */
 static void sme_prepare_beacon_from_bss_descp(uint8_t *frame_buf,
-					      tSirBssDescription *bss_descp,
+					      struct bss_description *bss_descp,
 					      const tSirMacAddr bssid,
 					      uint32_t ie_len)
 {
@@ -13646,7 +13646,7 @@ QDF_STATUS sme_get_rssi_snr_by_bssid(mac_handle_t mac_handle,
 				     const uint8_t *bssid,
 				     int8_t *rssi, int8_t *snr)
 {
-	tSirBssDescription *bss_descp;
+	struct bss_description *bss_descp;
 	tCsrScanResultFilter *scan_filter;
 	struct scan_result_list *bss_list;
 	tScanResultHandle result_handle = NULL;
@@ -13725,7 +13725,7 @@ QDF_STATUS sme_get_beacon_frm(mac_handle_t mac_handle,
 	tScanResultHandle result_handle = NULL;
 	tCsrScanResultFilter *scan_filter;
 	struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle);
-	tSirBssDescription *bss_descp;
+	struct bss_description *bss_descp;
 	struct scan_result_list *bss_list;
 	uint32_t ie_len;
 
@@ -13774,7 +13774,7 @@ QDF_STATUS sme_get_beacon_frm(mac_handle_t mac_handle,
 	 * Length of BSS descriptor is without length of
 	 * length itself and length of pointer that holds ieFields.
 	 *
-	 * tSirBssDescription
+	 * struct bss_description
 	 * +--------+---------------------------------+---------------+
 	 * | length | other fields                    | pointer to IEs|
 	 * +--------+---------------------------------+---------------+
@@ -13782,7 +13782,7 @@ QDF_STATUS sme_get_beacon_frm(mac_handle_t mac_handle,
 	 *                                            ieFields
 	 */
 	ie_len = bss_descp->length + sizeof(bss_descp->length)
-		- (uint16_t)(offsetof(tSirBssDescription, ieFields[0]));
+		- (uint16_t)(offsetof(struct bss_description, ieFields[0]));
 	sme_debug("found bss_descriptor ie_len: %d channel %d",
 					ie_len, bss_descp->channelId);
 
@@ -14497,8 +14497,8 @@ uint32_t sme_unpack_rsn_ie(mac_handle_t mac_handle, uint8_t *buf,
  * @info->status. Otherwise returns false.
  */
 static bool sme_get_status_for_candidate(mac_handle_t mac_handle,
-					 tSirBssDescription *conn_bss_desc,
-					 tSirBssDescription *bss_desc,
+					 struct bss_description *conn_bss_desc,
+					 struct bss_description *bss_desc,
 					 struct bss_candidate_info *info,
 					 uint8_t trans_reason,
 					 bool is_bt_in_progress)
@@ -14593,7 +14593,7 @@ QDF_STATUS sme_get_bss_transition_status(mac_handle_t mac_handle,
 					 bool is_bt_in_progress)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
-	tSirBssDescription *bss_desc, *conn_bss_desc;
+	struct bss_description *bss_desc, *conn_bss_desc;
 	tCsrScanResultInfo *res, *conn_res;
 	uint16_t i;
 

core/sme/src/csr/csr_api_roam.c

@@ -114,11 +114,11 @@
 #define ROAM_REASON_MASK 0x0F
 /**
  * csr_get_ielen_from_bss_description() - to get IE length
- *             from tSirBssDescription structure
+ *             from struct bss_description structure
  * @pBssDescr: pBssDescr
  *
  * This function is called in various places to get IE length
- * from tSirBssDescription structure
+ * from struct bss_description structure
  *
  * @Return: total IE length
  */
@@ -135,7 +135,7 @@ csr_get_ielen_from_bss_description(struct bss_description *pBssDescr)
 	 * length itself and length of pointer
 	 * that holds ieFields
 	 *
-	 * <------------sizeof(tSirBssDescription)-------------------->
+	 * <------------sizeof(struct bss_description)-------------------->
 	 * +--------+---------------------------------+---------------+
 	 * | length | other fields                    | pointer to IEs|
 	 * +--------+---------------------------------+---------------+
@@ -144,7 +144,7 @@ csr_get_ielen_from_bss_description(struct bss_description *pBssDescr)
 	 */
 
 	ielen = (uint16_t)(pBssDescr->length + sizeof(pBssDescr->length) -
-			   GET_FIELD_OFFSET(tSirBssDescription, ieFields));
+			   GET_FIELD_OFFSET(struct bss_description, ieFields));
 
 	return ielen;
 }
@@ -469,7 +469,7 @@ csr_roam_get_phy_mode_band_for_bss(struct mac_context *mac,
 				   uint8_t operationChn,
 				   enum band_info *pBand);
 static QDF_STATUS csr_roam_get_qos_info_from_bss(
-struct mac_context *mac, tSirBssDescription *pBssDesc);
+struct mac_context *mac, struct bss_description *pBssDesc);
 static uint32_t csr_find_ibss_session(struct mac_context *mac);
 static uint32_t csr_find_session_by_type(struct mac_context *,
 					enum QDF_OPMODE);
@@ -480,14 +480,17 @@ static bool csr_is_conn_allow_5g_band(struct mac_context *mac,
 static QDF_STATUS csr_roam_start_wds(struct mac_context *mac,
 						uint32_t sessionId,
 				     struct csr_roam_profile *pProfile,
-				     tSirBssDescription *pBssDesc);
+				     struct bss_description *pBssDesc);
 static void csr_init_session(struct mac_context *mac, uint32_t sessionId);
 static QDF_STATUS csr_roam_issue_set_key_command(struct mac_context *mac,
 						 uint32_t sessionId,
 						 tCsrRoamSetKey *pSetKey,
 						 uint32_t roamId);
-static QDF_STATUS csr_roam_get_qos_info_from_bss(struct mac_context *mac,
-						 tSirBssDescription *pBssDesc);
+
+static QDF_STATUS
+csr_roam_get_qos_info_from_bss(struct mac_context *mac,
+			       struct bss_description *pBssDesc);
+
 static void csr_init_operating_classes(struct mac_context *mac);
 
 static void csr_add_len_of_social_channels(struct mac_context *mac,
@@ -3789,8 +3792,8 @@ QDF_STATUS csr_roam_issue_deauth(struct mac_context *mac, uint32_t sessionId,
 }
 
 QDF_STATUS csr_roam_save_connected_bss_desc(struct mac_context *mac,
-						uint32_t sessionId,
-						tSirBssDescription *pBssDesc)
+					    uint32_t sessionId,
+					    struct bss_description *pBssDesc)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
@@ -3832,7 +3835,7 @@ QDF_STATUS csr_roam_save_connected_bss_desc(struct mac_context *mac,
 static
 QDF_STATUS csr_roam_prepare_bss_config(struct mac_context *mac,
 				       struct csr_roam_profile *pProfile,
-				       tSirBssDescription *pBssDesc,
+				       struct bss_description *pBssDesc,
 				       struct bss_config_param *pBssConfig,
 				       tDot11fBeaconIEs *pIes)
 {
@@ -3993,7 +3996,7 @@ QDF_STATUS csr_roam_prepare_bss_config(struct mac_context *mac,
 QDF_STATUS csr_roam_prepare_bss_config_from_profile(
 	struct mac_context *mac, struct csr_roam_profile *pProfile,
 					struct bss_config_param *pBssConfig,
-					tSirBssDescription *pBssDesc)
+					struct bss_description *pBssDesc)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	uint8_t operationChannel = 0;
@@ -4098,8 +4101,9 @@ QDF_STATUS csr_roam_prepare_bss_config_from_profile(
 	return status;
 }
 
-static QDF_STATUS csr_roam_get_qos_info_from_bss(struct mac_context *mac,
-						 tSirBssDescription *pBssDesc)
+static QDF_STATUS
+csr_roam_get_qos_info_from_bss(struct mac_context *mac,
+			       struct bss_description *pBssDesc)
 {
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tDot11fBeaconIEs *pIes = NULL;
@@ -4372,7 +4376,7 @@ static QDF_STATUS csr_set_qos_to_cfg(struct mac_context *mac, uint32_t sessionId
 static QDF_STATUS csr_get_rate_set(struct mac_context *mac,
 				   struct csr_roam_profile *pProfile,
 				   eCsrPhyMode phyMode,
-				   tSirBssDescription *pBssDesc,
+				   struct bss_description *pBssDesc,
 				   tDot11fBeaconIEs *pIes,
 				   tSirMacRateSet *pOpRateSet,
 				   tSirMacRateSet *pExRateSet)
@@ -4446,7 +4450,7 @@ static QDF_STATUS csr_get_rate_set(struct mac_context *mac,
 
 static void csr_set_cfg_rate_set(struct mac_context *mac, eCsrPhyMode phyMode,
 				 struct csr_roam_profile *pProfile,
-				 tSirBssDescription *pBssDesc,
+				 struct bss_description *pBssDesc,
 				 tDot11fBeaconIEs *pIes)
 {
 	int i;
@@ -4671,7 +4675,7 @@ static void csr_roam_ccm_cfg_set_callback(struct mac_context *mac,
 /* pIes may be NULL */
 QDF_STATUS csr_roam_set_bss_config_cfg(struct mac_context *mac, uint32_t sessionId,
 				       struct csr_roam_profile *pProfile,
-				       tSirBssDescription *pBssDesc,
+				       struct bss_description *pBssDesc,
 				       struct bss_config_param *pBssConfig,
 				       struct sDot11fBeaconIEs *pIes,
 				       bool resetCountry)
@@ -4761,7 +4765,7 @@ QDF_STATUS csr_roam_set_bss_config_cfg(struct mac_context *mac, uint32_t session
 static
 QDF_STATUS csr_roam_stop_network(struct mac_context *mac, uint32_t sessionId,
 				 struct csr_roam_profile *roam_profile,
-				 tSirBssDescription *pBssDesc,
+				 struct bss_description *pBssDesc,
 				 tDot11fBeaconIEs *pIes)
 {
 	QDF_STATUS status;
@@ -4862,7 +4866,7 @@ static enum csr_join_state csr_roam_state_for_same_profile(
 	struct mac_context *mac_ctx, struct csr_roam_profile *profile,
 			struct csr_roam_session *session,
 			uint32_t session_id, tDot11fBeaconIEs *ies_local,
-			tSirBssDescription *bss_descr)
+			struct bss_description *bss_descr)
 {
 	QDF_STATUS status;
 	struct bss_config_param bssConfig;
@@ -4896,7 +4900,7 @@ static enum csr_join_state csr_roam_join(struct mac_context *mac,
 				   struct csr_roam_profile *pProfile)
 {
 	enum csr_join_state eRoamState = eCsrContinueRoaming;
-	tSirBssDescription *pBssDesc = &pScanResult->BssDescriptor;
+	struct bss_description *pBssDesc = &pScanResult->BssDescriptor;
 	tDot11fBeaconIEs *pIesLocal = (tDot11fBeaconIEs *) (pScanResult->pvIes);
 	struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
 
@@ -4968,9 +4972,9 @@ static enum csr_join_state csr_roam_join(struct mac_context *mac,
 	return eRoamState;
 }
 
-static
-QDF_STATUS csr_roam_should_roam(struct mac_context *mac, uint32_t sessionId,
-				tSirBssDescription *pBssDesc, uint32_t roamId)
+static QDF_STATUS
+csr_roam_should_roam(struct mac_context *mac, uint32_t sessionId,
+		     struct bss_description *pBssDesc, uint32_t roamId)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	struct csr_roam_info *roam_info;
@@ -5490,7 +5494,7 @@ QDF_STATUS csr_process_ft_reassoc_roam_command(struct mac_context *mac,
 	uint32_t sessionId;
 	struct csr_roam_session *pSession;
 	struct tag_csrscan_result *pScanResult = NULL;
-	tSirBssDescription *pBssDesc = NULL;
+	struct bss_description *pBssDesc = NULL;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
 	sessionId = pCommand->sessionId;
@@ -6043,11 +6047,11 @@ static QDF_STATUS csr_roam_save_params(struct mac_context *mac_ctx,
 	return QDF_STATUS_SUCCESS;
 }
 
-static QDF_STATUS csr_roam_save_security_rsp_ie(struct mac_context *mac,
-						uint32_t sessionId,
-						eCsrAuthType authType,
-						tSirBssDescription *pSirBssDesc,
-						tDot11fBeaconIEs *pIes)
+static QDF_STATUS
+csr_roam_save_security_rsp_ie(struct mac_context *mac,
+			      uint32_t sessionId, eCsrAuthType authType,
+			      struct bss_description *pSirBssDesc,
+			      tDot11fBeaconIEs *pIes)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
@@ -6524,7 +6528,7 @@ static void csr_roam_process_start_bss_success(struct mac_context *mac_ctx,
 	uint32_t session_id = cmd->sessionId;
 	struct csr_roam_profile *profile = &cmd->u.roamCmd.roamProfile;
 	struct csr_roam_session *session;
-	tSirBssDescription *bss_desc = NULL;
+	struct bss_description *bss_desc = NULL;
 	struct csr_roam_info *roam_info;
 	struct start_bss_rsp *start_bss_rsp = NULL;
 	eRoamCmdStatus roam_status;
@@ -6820,7 +6824,7 @@ static void csr_process_fils_join_rsp(struct mac_context *mac_ctx,
 					struct csr_roam_profile *profile,
 					uint32_t session_id,
 					struct csr_roam_info *roam_info,
-					tSirBssDescription *bss_desc,
+					struct bss_description *bss_desc,
 					struct join_rsp *join_rsp)
 {
 	tSirMacAddr bcast_mac = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
@@ -6870,7 +6874,7 @@ static inline void csr_process_fils_join_rsp(struct mac_context *mac_ctx,
 					     struct csr_roam_profile *profile,
 					     uint32_t session_id,
 					     struct csr_roam_info *roam_info,
-					     tSirBssDescription *bss_desc,
+					     struct bss_description *bss_desc,
 					     struct join_rsp *join_rsp)
 {}
 #endif
@@ -6896,7 +6900,7 @@ static void csr_roam_process_join_res(struct mac_context *mac_ctx,
 	uint32_t session_id = cmd->sessionId;
 	struct csr_roam_profile *profile = &cmd->u.roamCmd.roamProfile;
 	struct csr_roam_session *session;
-	tSirBssDescription *bss_desc = NULL;
+	struct bss_description *bss_desc = NULL;
 	struct tag_csrscan_result *scan_res = NULL;
 	sme_qos_csr_event_indType ind_qos;
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
@@ -7300,7 +7304,7 @@ static bool csr_roam_process_results(struct mac_context *mac_ctx, tSmeCmd *cmd,
 					void *context)
 {
 	bool release_cmd = true;
-	tSirBssDescription *bss_desc = NULL;
+	struct bss_description *bss_desc = NULL;
 	struct csr_roam_info *roam_info;
 	uint32_t session_id = cmd->sessionId;
 	struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id);
@@ -7354,7 +7358,7 @@ static bool csr_roam_process_results(struct mac_context *mac_ctx, tSmeCmd *cmd,
 		}
 
 		if (context)
-			bss_desc = (tSirBssDescription *) context;
+			bss_desc = (struct bss_description *) context;
 		else
 			bss_desc = NULL;
 		roam_info->pBssDesc = bss_desc;
@@ -8022,7 +8026,7 @@ QDF_STATUS csr_roam_connect(struct mac_context *mac, uint32_t sessionId,
 	uint32_t roamId = 0;
 	bool fCallCallback = false;
 	struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
-	tSirBssDescription *first_ap_profile;
+	struct bss_description *first_ap_profile;
 	uint8_t channel_id = 0;
 
 	if (!pSession) {
@@ -8551,11 +8555,12 @@ QDF_STATUS csr_roam_disconnect(struct mac_context *mac_ctx, uint32_t session_id,
 	return csr_roam_disconnect_internal(mac_ctx, session_id, reason);
 }
 
-QDF_STATUS csr_roam_save_connected_information(struct mac_context *mac,
-					      uint32_t sessionId,
-					      struct csr_roam_profile *pProfile,
-					      tSirBssDescription *pSirBssDesc,
-					      tDot11fBeaconIEs *pIes)
+QDF_STATUS
+csr_roam_save_connected_information(struct mac_context *mac,
+				    uint32_t sessionId,
+				    struct csr_roam_profile *pProfile,
+				    struct bss_description *pSirBssDesc,
+				    tDot11fBeaconIEs *pIes)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	tDot11fBeaconIEs *pIesTemp = pIes;
@@ -8893,7 +8898,7 @@ static void csr_roam_join_rsp_processor(struct mac_context *mac,
 }
 
 static QDF_STATUS csr_roam_issue_join(struct mac_context *mac, uint32_t sessionId,
-				      tSirBssDescription *pSirBssDesc,
+				      struct bss_description *pSirBssDesc,
 				      tDot11fBeaconIEs *pIes,
 				      struct csr_roam_profile *pProfile,
 				      uint32_t roamId)
@@ -9017,7 +9022,7 @@ csr_roaming_state_config_cnf_processor(struct mac_context *mac_ctx,
 				       uint8_t sme_session_id)
 {
 	struct tag_csrscan_result *scan_result = NULL;
-	tSirBssDescription *bss_desc = NULL;
+	struct bss_description *bss_desc = NULL;
 	uint32_t session_id;
 	struct csr_roam_session *session;
 	tDot11fBeaconIEs *local_ies = NULL;
@@ -10151,7 +10156,7 @@ QDF_STATUS csr_roam_issue_set_context_req_helper(
 					struct mac_context *mac_ctx,
 					uint32_t session_id,
 					eCsrEncryptionType encr_type,
-					tSirBssDescription *bss_descr,
+					struct bss_description *bss_descr,
 					tSirMacAddr *bssid, bool addkey,
 					bool unicast,
 					tAniKeyDirection key_direction,
@@ -10182,7 +10187,7 @@ QDF_STATUS csr_roam_issue_set_context_req_helper(
 static QDF_STATUS
 csr_roam_issue_set_context_req(struct mac_context *mac, uint32_t sessionId,
 			       eCsrEncryptionType EncryptType,
-			       tSirBssDescription *pBssDescription,
+			       struct bss_description *pBssDescription,
 			       tSirMacAddr *bssId, bool addKey, bool fUnicast,
 			       tAniKeyDirection aniKeyDirection, uint8_t keyId,
 			       uint16_t keyLength, uint8_t *pKey,
@@ -10228,7 +10233,7 @@ QDF_STATUS csr_roam_issue_set_context_req_helper(
 					struct mac_context *mac_ctx,
 					uint32_t session_id,
 					eCsrEncryptionType encr_type,
-					tSirBssDescription *bss_descr,
+					struct bss_description *bss_descr,
 					tSirMacAddr *bssid, bool addkey,
 					bool unicast,
 					tAniKeyDirection key_direction,
@@ -14074,7 +14079,7 @@ csr_roam_get_bss_start_parms(struct mac_context *mac,
 static void
 csr_roam_get_bss_start_parms_from_bss_desc(
 					struct mac_context *mac,
-					tSirBssDescription *pBssDesc,
+					struct bss_description *pBssDesc,
 					tDot11fBeaconIEs *pIes,
 					struct csr_roamstart_bssparams *pParam)
 {
@@ -14155,7 +14160,7 @@ static void csr_roam_determine_max_rate_for_ad_hoc(struct mac_context *mac,
 QDF_STATUS csr_roam_issue_start_bss(struct mac_context *mac, uint32_t sessionId,
 				    struct csr_roamstart_bssparams *pParam,
 				    struct csr_roam_profile *pProfile,
-				    tSirBssDescription *pBssDesc,
+				    struct bss_description *pBssDesc,
 					uint32_t roamId)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
@@ -14268,7 +14273,7 @@ QDF_STATUS csr_roam_issue_start_bss(struct mac_context *mac, uint32_t sessionId,
 
 void csr_roam_prepare_bss_params(struct mac_context *mac, uint32_t sessionId,
 					struct csr_roam_profile *pProfile,
-					tSirBssDescription *pBssDesc,
+					struct bss_description *pBssDesc,
 					struct bss_config_param *pBssConfig,
 					tDot11fBeaconIEs *pIes)
 {
@@ -14806,7 +14811,7 @@ eRoamCmdStatus csr_get_roam_complete_status(struct mac_context *mac,
 
 static QDF_STATUS csr_roam_start_wds(struct mac_context *mac, uint32_t sessionId,
 				     struct csr_roam_profile *pProfile,
-				     tSirBssDescription *pBssDesc)
+				     struct bss_description *pBssDesc)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
@@ -15271,12 +15276,12 @@ csr_get_adaptive_11r_enabled(struct mac_context *mac)
  * regular way like struct join_req.assocType, this guideline stops at component
  * tSirRSNie;
  * any acces to the components after tSirRSNie is forbidden because the space
- * from tSirRSNie is squeezed with the component "tSirBssDescription" and since
- * the size of actual 'tSirBssDescription' varies, the receiving side should
- * keep in mind not to access the components DIRECTLY after tSirRSNie.
+ * from tSirRSNie is squeezed with the component "struct bss_description" and
+ * since the size of actual 'struct bss_description' varies, the receiving side
+ * should keep in mind not to access the components DIRECTLY after tSirRSNie.
  */
 QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId,
-				 tSirBssDescription *pBssDescription,
+				 struct bss_description *pBssDescription,
 				 struct csr_roam_profile *pProfile,
 				 tDot11fBeaconIEs *pIes, uint16_t messageType)
 {
@@ -16572,7 +16577,7 @@ QDF_STATUS csr_send_mb_set_context_req_msg(struct mac_context *mac,
 QDF_STATUS csr_send_mb_start_bss_req_msg(struct mac_context *mac, uint32_t
 					sessionId, eCsrRoamBssType bssType,
 					 struct csr_roamstart_bssparams *pParam,
-					 tSirBssDescription *pBssDesc)
+					 struct bss_description *pBssDesc)
 {
 	struct start_bss_req *pMsg;
 	uint16_t wTmp;

core/sme/src/csr/csr_api_scan.c

@@ -373,7 +373,7 @@ static void csr_scan_add_result(struct mac_context *mac_ctx,
 	struct wlan_frame_hdr *hdr;
 	struct wlan_bcn_frame *fixed_frame;
 	uint32_t buf_len, i;
-	tSirBssDescription *bss_desc;
+	struct bss_description *bss_desc;
 	enum mgmt_frame_type frm_type = MGMT_BEACON;
 
 	if (!pResult) {
@@ -426,8 +426,9 @@ static void csr_scan_add_result(struct mac_context *mac_ctx,
 					    frm_type);
 }
 
-static bool csr_scan_save_bss_description(struct mac_context *mac,
-					  tSirBssDescription *pBSSDescription)
+static bool
+csr_scan_save_bss_description(struct mac_context *mac,
+			      struct bss_description *pBSSDescription)
 {
 	struct tag_csrscan_result *pCsrBssDescription = NULL;
 	uint32_t cbBSSDesc;
@@ -461,7 +462,7 @@ static bool csr_scan_save_bss_description(struct mac_context *mac,
 
 /* Append a Bss Description... */
 bool csr_scan_append_bss_description(struct mac_context *mac,
-				     tSirBssDescription *pSirBssDescription)
+				     struct bss_description *pSirBssDescription)
 {
 	return csr_scan_save_bss_description(mac, pSirBssDescription);
 }
@@ -864,7 +865,7 @@ bool csr_is_supported_channel(struct mac_context *mac, uint8_t channelId)
  * pAdapter->channels11d
  */
 bool csr_learn_11dcountry_information(struct mac_context *mac,
-				      tSirBssDescription *pSirBssDesc,
+				      struct bss_description *pSirBssDesc,
 				      tDot11fBeaconIEs *pIes, bool fForce)
 {
 	QDF_STATUS status;
@@ -1756,7 +1757,7 @@ QDF_STATUS csr_scan_create_entry_in_scan_cache(struct mac_context *mac,
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
-	tSirBssDescription *pNewBssDescriptor = NULL;
+	struct bss_description *pNewBssDescriptor = NULL;
 	uint32_t size = 0;
 
 	if (!pSession) {
@@ -1827,7 +1828,7 @@ csr_rso_save_ap_to_scan_cache(struct mac_context *mac,
 
 	qdf_mem_copy(&scan_res_ptr->Result.BssDescriptor,
 			bss_desc_ptr,
-			(sizeof(tSirBssDescription) + length));
+			(sizeof(struct bss_description) + length));
 
 	sme_debug("LFR3:Add BSSID to scan cache" QDF_MAC_ADDR_STR,
 		QDF_MAC_ADDR_ARRAY(scan_res_ptr->Result.BssDescriptor.bssId));
@@ -1884,9 +1885,9 @@ csr_get_fst_bssdescr_ptr(tScanResultHandle result_handle)
  *
  * Return: first bss descriptor from the scan handle.
  */
-tSirBssDescription *
+struct bss_description *
 csr_get_bssdescr_from_scan_handle(tScanResultHandle result_handle,
-				  tSirBssDescription *bss_descr)
+				  struct bss_description *bss_descr)
 {
 	tListElem *first_element = NULL;
 	struct tag_csrscan_result *scan_result = NULL;
@@ -1911,7 +1912,7 @@ csr_get_bssdescr_from_scan_handle(tScanResultHandle result_handle,
 				Link);
 		qdf_mem_copy(bss_descr,
 				&scan_result->Result.BssDescriptor,
-				sizeof(tSirBssDescription));
+				sizeof(struct bss_description));
 	}
 	return bss_descr;
 }
@@ -2493,7 +2494,7 @@ static QDF_STATUS csr_prepare_scan_filter(struct mac_context *mac_ctx,
  */
 static void csr_update_bss_with_fils_data(struct mac_context *mac_ctx,
 					  struct scan_cache_entry *scan_entry,
-					  tSirBssDescription *bss_descr)
+					  struct bss_description *bss_descr)
 {
 	int ret;
 	tDot11fIEfils_indication fils_indication = {0};
@@ -2532,7 +2533,7 @@ static void csr_update_bss_with_fils_data(struct mac_context *mac_ctx,
 #else
 static void csr_update_bss_with_fils_data(struct mac_context *mac_ctx,
 					  struct scan_cache_entry *scan_entry,
-					  tSirBssDescription *bss_descr)
+					  struct bss_description *bss_descr)
 { }
 #endif
 
@@ -2573,7 +2574,7 @@ static QDF_STATUS csr_fill_bss_from_scan_entry(struct mac_context *mac_ctx,
 					struct tag_csrscan_result **p_result)
 {
 	tDot11fBeaconIEs *bcn_ies;
-	tSirBssDescription *bss_desc;
+	struct bss_description *bss_desc;
 	tCsrScanResultInfo *result_info;
 	tpSirMacMgmtHdr hdr;
 	uint8_t *ie_ptr;
@@ -2586,7 +2587,7 @@ static QDF_STATUS csr_fill_bss_from_scan_entry(struct mac_context *mac_ctx,
 
 	hdr = (tpSirMacMgmtHdr)scan_entry->raw_frame.ptr;
 
-	bss_len = (uint16_t)(offsetof(tSirBssDescription,
+	bss_len = (uint16_t)(offsetof(struct bss_description,
 			   ieFields[0]) + ie_len);
 	alloc_len = sizeof(struct tag_csrscan_result) + bss_len;
 	bss = qdf_mem_malloc(alloc_len);
@@ -2612,7 +2613,7 @@ static QDF_STATUS csr_fill_bss_from_scan_entry(struct mac_context *mac_ctx,
 
 	bss_desc = &result_info->BssDescriptor;
 
-	bss_desc->length = (uint16_t) (offsetof(tSirBssDescription,
+	bss_desc->length = (uint16_t) (offsetof(struct bss_description,
 			   ieFields[0]) - sizeof(bss_desc->length) + ie_len);
 
 	qdf_mem_copy(bss_desc->bssId,
@@ -2747,7 +2748,7 @@ static QDF_STATUS csr_parse_scan_list(struct mac_context *mac_ctx,
  * Return: true if connection cannot be tried with AP else false
  */
 static bool csr_remove_ap_due_to_rssi(qdf_list_t *list,
-				      tSirBssDescription *bss_descr)
+				      struct bss_description *bss_descr)
 {
 	QDF_STATUS status;
 	struct sir_rssi_disallow_lst *cur_node = NULL;
@@ -3033,7 +3034,7 @@ QDF_STATUS csr_scan_get_result_for_bssid(struct mac_context *mac_ctx,
 			res->ssId.length);
 		res->timer = scan_result->timer;
 		qdf_mem_copy(&res->BssDescriptor, &scan_result->BssDescriptor,
-			sizeof(tSirBssDescription));
+			sizeof(struct bss_description));
 		status = QDF_STATUS_SUCCESS;
 	} else {
 		status = QDF_STATUS_E_FAILURE;

core/sme/src/csr/csr_host_scan_roam.c

@@ -45,7 +45,7 @@
  * Return: Success or Failure
  */
 QDF_STATUS csr_roam_issue_reassociate(struct mac_context *mac,
-	uint32_t sessionId, tSirBssDescription *pSirBssDesc,
+	uint32_t sessionId, struct bss_description *pSirBssDesc,
 	tDot11fBeaconIEs *pIes, struct csr_roam_profile *pProfile)
 {
 	csr_roam_state_change(mac, eCSR_ROAMING_STATE_JOINING, sessionId);
@@ -193,7 +193,7 @@ void csr_neighbor_roam_process_scan_results(struct mac_context *mac_ctx,
 
 	do {
 		while (true) {
-			tSirBssDescription *descr;
+			struct bss_description *descr;
 
 			scan_result = csr_scan_result_get_next(
 						mac_ctx, *scan_results_list);

core/sme/src/csr/csr_inside_api.h

@@ -87,7 +87,7 @@ struct tag_csrscan_result {
 	 */
 	uint32_t capValue;
 	/* This member must be the last in the structure because the end of
-	 * tSirBssDescription (inside) is an
+	 * struct bss_description (inside) is an
 	 * array with nonknown size at this time
 	 */
 	/* Preferred Encryption type that matched with profile. */
@@ -101,7 +101,7 @@ struct tag_csrscan_result {
 	/*
 	 * WARNING - Do not add any element here
 	 * This member Result must be the last in the structure because the end
-	 * of tSirBssDescription (inside) is an array with nonknown size at
+	 * of struct bss_description (inside) is an array with nonknown size at
 	 * this time.
 	 */
 };
@@ -154,7 +154,7 @@ void csr_release_command_wm_status_change(struct mac_context *mac,
 
 QDF_STATUS csr_roam_save_connected_bss_desc(struct mac_context *mac,
 					    uint32_t sessionId,
-					    tSirBssDescription *pBssDesc);
+					    struct bss_description *pBssDesc);
 
 /*
  * Prepare a filter base on a profile for parsing the scan results.
@@ -174,8 +174,11 @@ void csr_roam_stop(struct mac_context *mac, uint32_t sessionId);
 
 QDF_STATUS csr_scan_open(struct mac_context *mac);
 QDF_STATUS csr_scan_close(struct mac_context *mac);
-bool csr_scan_append_bss_description(struct mac_context *mac,
-				     tSirBssDescription *pSirBssDescription);
+
+bool
+csr_scan_append_bss_description(struct mac_context *mac,
+				struct bss_description *pSirBssDescription);
+
 QDF_STATUS csr_scan_for_ssid(struct mac_context *mac, uint32_t sessionId,
 			     struct csr_roam_profile *pProfile, uint32_t roamId,
 			     bool notify);
@@ -197,7 +200,7 @@ QDF_STATUS csr_remove_nonscan_cmd_from_pending_list(struct mac_context *mac,
 /* If fForce is true we will save the new String that is learn't. */
 /* Typically it will be true in case of Join or user initiated ioctl */
 bool csr_learn_11dcountry_information(struct mac_context *mac,
-				   tSirBssDescription *pSirBssDesc,
+				   struct bss_description *pSirBssDesc,
 				   tDot11fBeaconIEs *pIes, bool fForce);
 void csr_apply_country_information(struct mac_context *mac);
 void csr_free_scan_result_entry(struct mac_context *mac, struct tag_csrscan_result
@@ -223,7 +226,7 @@ QDF_STATUS
 csr_roam_issue_set_context_req_helper(struct mac_context *mac,
 				      uint32_t session_id,
 				      eCsrEncryptionType encr_type,
-				      tSirBssDescription *bss_descr,
+				      struct bss_description *bss_descr,
 				      tSirMacAddr *bssid, bool addkey,
 				      bool unicast,
 				      tAniKeyDirection key_direction,
@@ -233,11 +236,14 @@ csr_roam_issue_set_context_req_helper(struct mac_context *mac,
 QDF_STATUS csr_roam_process_disassoc_deauth(struct mac_context *mac,
 						tSmeCmd *pCommand,
 					    bool fDisassoc, bool fMICFailure);
-QDF_STATUS csr_roam_save_connected_information(struct mac_context *mac,
-					      uint32_t sessionId,
-					      struct csr_roam_profile *pProfile,
-					      tSirBssDescription *pSirBssDesc,
-					      tDot11fBeaconIEs *pIes);
+
+QDF_STATUS
+csr_roam_save_connected_information(struct mac_context *mac,
+				    uint32_t sessionId,
+				    struct csr_roam_profile *pProfile,
+				    struct bss_description *pSirBssDesc,
+				    tDot11fBeaconIEs *pIes);
+
 void csr_roam_check_for_link_status_change(struct mac_context *mac,
 					tSirSmeRsp *pSirMsg);
 
@@ -251,7 +257,7 @@ static inline void csr_roam_stats_rsp_processor(struct mac_context *mac,
 QDF_STATUS csr_roam_issue_start_bss(struct mac_context *mac, uint32_t sessionId,
 				    struct csr_roamstart_bssparams *pParam,
 				    struct csr_roam_profile *pProfile,
-				    tSirBssDescription *pBssDesc,
+				    struct bss_description *pBssDesc,
 					uint32_t roamId);
 QDF_STATUS csr_roam_issue_stop_bss(struct mac_context *mac, uint32_t sessionId,
 				   enum csr_roam_substate NewSubstate);
@@ -273,7 +279,7 @@ void csr_roam_remove_duplicate_command(struct mac_context *mac, uint32_t session
 				       enum csr_roam_reason eRoamReason);
 
 QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId,
-				 tSirBssDescription *pBssDescription,
+				 struct bss_description *pBssDescription,
 				 struct csr_roam_profile *pProfile,
 				 tDot11fBeaconIEs *pIes, uint16_t messageType);
 QDF_STATUS csr_send_mb_disassoc_req_msg(struct mac_context *mac, uint32_t sessionId,
@@ -292,7 +298,7 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(struct mac_context *mac,
 					 uint32_t sessionId,
 					 eCsrRoamBssType bssType,
 					 struct csr_roamstart_bssparams *pParam,
-					 tSirBssDescription *pBssDesc);
+					 struct bss_description *pBssDesc);
 QDF_STATUS csr_send_mb_stop_bss_req_msg(struct mac_context *mac,
 					uint32_t sessionId);
 
@@ -303,7 +309,7 @@ bool csr_is_ssid_match(struct mac_context *mac, uint8_t *ssid1, uint8_t ssid1Len
 		       uint8_t *bssSsid, uint8_t bssSsidLen,
 			bool fSsidRequired);
 bool csr_is_phy_mode_match(struct mac_context *mac, uint32_t phyMode,
-			   tSirBssDescription *pSirBssDesc,
+			   struct bss_description *pSirBssDesc,
 			   struct csr_roam_profile *pProfile,
 			   enum csr_cfgdot11mode *pReturnCfgDot11Mode,
 			   tDot11fBeaconIEs *pIes);
@@ -865,9 +871,10 @@ void csr_saved_scan_cmd_free_fields(struct mac_context *mac_ctx,
 struct bss_description*
 csr_get_fst_bssdescr_ptr(tScanResultHandle result_handle);
 
-tSirBssDescription*
+struct bss_description*
 csr_get_bssdescr_from_scan_handle(tScanResultHandle result_handle,
-				  tSirBssDescription *bss_descr);
+				  struct bss_description *bss_descr);
+
 bool is_disconnect_pending(struct mac_context *mac_ctx,
 				   uint8_t sessionid);
 
@@ -875,11 +882,14 @@ QDF_STATUS
 csr_roam_prepare_bss_config_from_profile(struct mac_context *mac_ctx,
 					 struct csr_roam_profile *profile,
 					 struct bss_config_param *bss_cfg,
-					 tSirBssDescription *bss_desc);
+					 struct bss_description *bss_desc);
 
-void csr_roam_prepare_bss_params(struct mac_context *mac_ctx, uint32_t session_id,
-		struct csr_roam_profile *profile, tSirBssDescription *bss_desc,
-		struct bss_config_param *bss_cfg, tDot11fBeaconIEs *ies);
+void
+csr_roam_prepare_bss_params(struct mac_context *mac_ctx, uint32_t session_id,
+			    struct csr_roam_profile *profile,
+			    struct bss_description *bss_desc,
+			    struct bss_config_param *bss_cfg,
+			    tDot11fBeaconIEs *ies);
 
 /**
  * csr_remove_bssid_from_scan_list() - remove the bssid from
@@ -892,13 +902,15 @@ void csr_roam_prepare_bss_params(struct mac_context *mac_ctx, uint32_t session_i
  * Return: void.
  */
 void csr_remove_bssid_from_scan_list(struct mac_context *mac_ctx,
-	tSirMacAddr bssid);
+				     tSirMacAddr bssid);
+
+QDF_STATUS
+csr_roam_set_bss_config_cfg(struct mac_context *mac_ctx, uint32_t session_id,
+			    struct csr_roam_profile *profile,
+			    struct bss_description *bss_desc,
+			    struct bss_config_param *bss_cfg,
+			    tDot11fBeaconIEs *ies, bool reset_country);
 
-QDF_STATUS csr_roam_set_bss_config_cfg(struct mac_context *mac_ctx,
-		uint32_t session_id,
-		struct csr_roam_profile *profile, tSirBssDescription *bss_desc,
-		struct bss_config_param *bss_cfg, tDot11fBeaconIEs *ies,
-		bool reset_country);
 void csr_prune_channel_list_for_mode(struct mac_context *mac,
 				     struct csr_channel *pChannelList);
 

core/sme/src/csr/csr_neighbor_roam.c

@@ -643,7 +643,7 @@ QDF_STATUS csr_neighbor_roam_merge_channel_lists(struct mac_context *mac,
  */
 static bool csr_neighbor_roam_is_ssid_and_security_match(struct mac_context *mac,
 		tCsrRoamConnectedProfile *pCurProfile,
-		tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes,
+		struct bss_description *pBssDesc, tDot11fBeaconIEs *pIes,
 		uint8_t session_id)
 {
 	tCsrAuthList authType;
@@ -709,7 +709,7 @@ bool csr_neighbor_roam_is_new_connected_profile(struct mac_context *mac,
 	tCsrRoamConnectedProfile *pCurrProfile = NULL;
 	tCsrRoamConnectedProfile *pPrevProfile = NULL;
 	tDot11fBeaconIEs *pIes = NULL;
-	tSirBssDescription *pBssDesc = NULL;
+	struct bss_description *pBssDesc = NULL;
 	bool fNew = true;
 
 	if (!(mac->roam.roamSession && CSR_IS_SESSION_VALID(mac, sessionId)))
@@ -747,7 +747,7 @@ bool csr_neighbor_roam_connected_profile_match(struct mac_context *mac,
 					       tDot11fBeaconIEs *pIes)
 {
 	tCsrRoamConnectedProfile *pCurProfile = NULL;
-	tSirBssDescription *pBssDesc = &pResult->Result.BssDescriptor;
+	struct bss_description *pBssDesc = &pResult->Result.BssDescriptor;
 
 	if (!(mac->roam.roamSession && CSR_IS_SESSION_VALID(mac, sessionId)))
 		return false;

core/sme/src/csr/csr_util.c

@@ -541,7 +541,7 @@ tListElem *csr_nonscan_pending_ll_next(struct mac_context *mac_ctx,
 	return &sme_cmd->Link;
 }
 
-bool csr_get_bss_id_bss_desc(tSirBssDescription *pSirBssDesc,
+bool csr_get_bss_id_bss_desc(struct bss_description *pSirBssDesc,
 			     struct qdf_mac_addr *pBssId)
 {
 	qdf_mem_copy(pBssId, &pSirBssDesc->bssId[0],
@@ -549,8 +549,8 @@ bool csr_get_bss_id_bss_desc(tSirBssDescription *pSirBssDesc,
 	return true;
 }
 
-bool csr_is_bss_id_equal(tSirBssDescription *pSirBssDesc1,
-			 tSirBssDescription *pSirBssDesc2)
+bool csr_is_bss_id_equal(struct bss_description *pSirBssDesc1,
+			 struct bss_description *pSirBssDesc2)
 {
 	bool fEqual = false;
 	struct qdf_mac_addr bssId1;
@@ -1214,7 +1214,7 @@ bool csr_is_conn_state_disconnected(struct mac_context *mac, uint32_t sessionId)
  */
 bool csr_is_valid_mc_concurrent_session(struct mac_context *mac_ctx,
 		uint32_t session_id,
-		tSirBssDescription *bss_descr)
+		struct bss_description *bss_descr)
 {
 	struct csr_roam_session *pSession = NULL;
 
@@ -1235,7 +1235,7 @@ bool csr_is_valid_mc_concurrent_session(struct mac_context *mac_ctx,
 	return false;
 }
 
-static tSirMacCapabilityInfo csr_get_bss_capabilities(tSirBssDescription *
+static tSirMacCapabilityInfo csr_get_bss_capabilities(struct bss_description *
 						      pSirBssDesc)
 {
 	tSirMacCapabilityInfo dot11Caps;
@@ -1247,28 +1247,28 @@ static tSirMacCapabilityInfo csr_get_bss_capabilities(tSirBssDescription *
 	return dot11Caps;
 }
 
-bool csr_is_infra_bss_desc(tSirBssDescription *pSirBssDesc)
+bool csr_is_infra_bss_desc(struct bss_description *pSirBssDesc)
 {
 	tSirMacCapabilityInfo dot11Caps = csr_get_bss_capabilities(pSirBssDesc);
 
 	return (bool) dot11Caps.ess;
 }
 
-bool csr_is_ibss_bss_desc(tSirBssDescription *pSirBssDesc)
+bool csr_is_ibss_bss_desc(struct bss_description *pSirBssDesc)
 {
 	tSirMacCapabilityInfo dot11Caps = csr_get_bss_capabilities(pSirBssDesc);
 
 	return (bool) dot11Caps.ibss;
 }
 
-static bool csr_is_qos_bss_desc(tSirBssDescription *pSirBssDesc)
+static bool csr_is_qos_bss_desc(struct bss_description *pSirBssDesc)
 {
 	tSirMacCapabilityInfo dot11Caps = csr_get_bss_capabilities(pSirBssDesc);
 
 	return (bool) dot11Caps.qos;
 }
 
-bool csr_is_privacy(tSirBssDescription *pSirBssDesc)
+bool csr_is_privacy(struct bss_description *pSirBssDesc)
 {
 	tSirMacCapabilityInfo dot11Caps = csr_get_bss_capabilities(pSirBssDesc);
 
@@ -1295,8 +1295,8 @@ bool csr_is_wmm_supported(struct mac_context *mac)
 
 /* pIes is the IEs for pSirBssDesc2 */
 bool csr_is_ssid_equal(struct mac_context *mac,
-		       tSirBssDescription *pSirBssDesc1,
-		       tSirBssDescription *pSirBssDesc2,
+		       struct bss_description *pSirBssDesc1,
+		       struct bss_description *pSirBssDesc2,
 		       tDot11fBeaconIEs *pIes2)
 {
 	bool fEqual = false;
@@ -1343,7 +1343,7 @@ bool csr_is_ssid_equal(struct mac_context *mac,
 
 /* pIes can be passed in as NULL if the caller doesn't have one prepared */
 static bool csr_is_bss_description_wme(struct mac_context *mac,
-				       tSirBssDescription *pSirBssDesc,
+				       struct bss_description *pSirBssDesc,
 				       tDot11fBeaconIEs *pIes)
 {
 	/* Assume that WME is found... */
@@ -1376,9 +1376,10 @@ static bool csr_is_bss_description_wme(struct mac_context *mac,
 	return fWme;
 }
 
-eCsrMediaAccessType csr_get_qos_from_bss_desc(struct mac_context *mac_ctx,
-					      tSirBssDescription *pSirBssDesc,
-					      tDot11fBeaconIEs *pIes)
+eCsrMediaAccessType
+csr_get_qos_from_bss_desc(struct mac_context *mac_ctx,
+			  struct bss_description *pSirBssDesc,
+			  tDot11fBeaconIEs *pIes)
 {
 	eCsrMediaAccessType qosType = eCSR_MEDIUM_ACCESS_DCF;
 
@@ -1417,13 +1418,13 @@ eCsrMediaAccessType csr_get_qos_from_bss_desc(struct mac_context *mac_ctx,
 
 /* Caller allocates memory for pIEStruct */
 QDF_STATUS csr_parse_bss_description_ies(struct mac_context *mac_ctx,
-					 tSirBssDescription *pBssDesc,
+					 struct bss_description *pBssDesc,
 					 tDot11fBeaconIEs *pIEStruct)
 {
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	int ieLen =
 		(int)(pBssDesc->length + sizeof(pBssDesc->length) -
-		      GET_FIELD_OFFSET(tSirBssDescription, ieFields));
+		      GET_FIELD_OFFSET(struct bss_description, ieFields));
 
 	if (ieLen > 0 && pIEStruct) {
 		if (!DOT11F_FAILED(dot11f_unpack_beacon_i_es
@@ -1440,7 +1441,7 @@ QDF_STATUS csr_parse_bss_description_ies(struct mac_context *mac_ctx,
  * this function succeeds
  */
 QDF_STATUS csr_get_parsed_bss_description_ies(struct mac_context *mac_ctx,
-					      tSirBssDescription *pBssDesc,
+					      struct bss_description *pBssDesc,
 					      tDot11fBeaconIEs **ppIEStruct)
 {
 	QDF_STATUS status = QDF_STATUS_E_INVAL;
@@ -1515,7 +1516,7 @@ uint32_t csr_get_rts_thresh(struct mac_context *mac_ctx)
 
 static eCsrPhyMode
 csr_translate_to_phy_mode_from_bss_desc(struct mac_context *mac_ctx,
-					tSirBssDescription *pSirBssDesc,
+					struct bss_description *pSirBssDesc,
 					tDot11fBeaconIEs *ies)
 {
 	eCsrPhyMode phyMode;
@@ -1648,7 +1649,7 @@ uint32_t csr_translate_to_wni_cfg_dot11_mode(struct mac_context *mac,
  * Return: success
  **/
 QDF_STATUS csr_get_phy_mode_from_bss(struct mac_context *mac,
-		tSirBssDescription *pBSSDescription,
+		struct bss_description *pBSSDescription,
 		eCsrPhyMode *pPhyMode, tDot11fBeaconIEs *pIes)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
@@ -1898,7 +1899,7 @@ static bool csr_get_phy_mode_in_use(struct mac_context *mac_ctx,
  * Return: true or false based on mode that fits the criteria
  */
 bool csr_is_phy_mode_match(struct mac_context *mac, uint32_t phyMode,
-			   tSirBssDescription *pSirBssDesc,
+			   struct bss_description *pSirBssDesc,
 			   struct csr_roam_profile *pProfile,
 			   enum csr_cfgdot11mode *pReturnCfgDot11Mode,
 			   tDot11fBeaconIEs *pIes)
@@ -3855,7 +3856,7 @@ static bool csr_lookup_pmkid(struct mac_context *mac, uint32_t sessionId,
  *
  * Return: true if cache identifier present else false
  */
-static bool csr_update_pmksa_for_cache_id(tSirBssDescription *bss_desc,
+static bool csr_update_pmksa_for_cache_id(struct bss_description *bss_desc,
 				struct csr_roam_profile *profile,
 				tPmkidCacheInfo *pmkid_cache)
 {
@@ -3899,9 +3900,10 @@ static inline void csr_update_pmksa_to_profile(struct csr_roam_profile *profile,
 
 }
 #else
-static inline bool csr_update_pmksa_for_cache_id(tSirBssDescription *bss_desc,
-				struct csr_roam_profile *profile,
-				tPmkidCacheInfo *pmkid_cache)
+static inline
+bool csr_update_pmksa_for_cache_id(struct bss_description *bss_desc,
+				   struct csr_roam_profile *profile,
+				   tPmkidCacheInfo *pmkid_cache)
 {
 	return false;
 }
@@ -3915,7 +3917,7 @@ static inline void csr_update_pmksa_to_profile(struct csr_roam_profile *profile,
 #ifdef WLAN_CONV_CRYPTO_IE_SUPPORT
 uint8_t csr_construct_rsn_ie(struct mac_context *mac, uint32_t sessionId,
 			     struct csr_roam_profile *pProfile,
-			     tSirBssDescription *pSirBssDesc,
+			     struct bss_description *pSirBssDesc,
 			     tDot11fBeaconIEs *ap_ie, tCsrRSNIe *pRSNIe)
 {
 	struct wlan_objmgr_vdev *vdev;
@@ -3990,7 +3992,7 @@ static inline void csr_update_session_pmk(struct csr_roam_session *session,
 
 uint8_t csr_construct_rsn_ie(struct mac_context *mac, uint32_t sessionId,
 			     struct csr_roam_profile *pProfile,
-			     tSirBssDescription *pSirBssDesc,
+			     struct bss_description *pSirBssDesc,
 			     tDot11fBeaconIEs *pIes, tCsrRSNIe *pRSNIe)
 {
 	uint32_t ret;
@@ -4387,7 +4389,7 @@ static bool csr_lookup_bkid(struct mac_context *mac, uint32_t sessionId,
 #ifdef WLAN_CONV_CRYPTO_IE_SUPPORT
 uint8_t csr_construct_wapi_ie(struct mac_context *mac, uint32_t sessionId,
 			      struct csr_roam_profile *pProfile,
-			      tSirBssDescription *pSirBssDesc,
+			      struct bss_description *pSirBssDesc,
 			      tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe)
 {
 	struct wlan_objmgr_vdev *vdev;
@@ -4412,7 +4414,7 @@ uint8_t csr_construct_wapi_ie(struct mac_context *mac, uint32_t sessionId,
 #else
 uint8_t csr_construct_wapi_ie(struct mac_context *mac, uint32_t sessionId,
 			      struct csr_roam_profile *pProfile,
-			      tSirBssDescription *pSirBssDesc,
+			      struct bss_description *pSirBssDesc,
 			      tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe)
 {
 	bool fWapiMatch = false;
@@ -4692,7 +4694,7 @@ static bool csr_is_wpa_encryption_match(struct mac_context *mac,
 #ifdef WLAN_CONV_CRYPTO_IE_SUPPORT
 uint8_t csr_construct_wpa_ie(struct mac_context *mac, uint8_t session_id,
 			     struct csr_roam_profile *pProfile,
-			     tSirBssDescription *pSirBssDesc,
+			     struct bss_description *pSirBssDesc,
 			     tDot11fBeaconIEs *pIes, tCsrWpaIe *pWpaIe)
 {
 	struct wlan_objmgr_vdev *vdev;
@@ -4717,7 +4719,7 @@ uint8_t csr_construct_wpa_ie(struct mac_context *mac, uint8_t session_id,
 #else
 uint8_t csr_construct_wpa_ie(struct mac_context *mac, uint8_t session_id,
 			     struct csr_roam_profile *pProfile,
-			     tSirBssDescription *pSirBssDesc,
+			     struct bss_description *pSirBssDesc,
 			     tDot11fBeaconIEs *pIes, tCsrWpaIe *pWpaIe)
 {
 	bool fWpaMatch;
@@ -4804,7 +4806,7 @@ uint8_t csr_construct_wpa_ie(struct mac_context *mac, uint8_t session_id,
  */
 uint8_t csr_retrieve_wpa_ie(struct mac_context *mac, uint8_t session_id,
 			    struct csr_roam_profile *pProfile,
-			    tSirBssDescription *pSirBssDesc,
+			    struct bss_description *pSirBssDesc,
 			    tDot11fBeaconIEs *pIes, tCsrWpaIe *pWpaIe)
 {
 	uint8_t cbWpaIe = 0;
@@ -4843,7 +4845,7 @@ uint8_t csr_retrieve_wpa_ie(struct mac_context *mac, uint8_t session_id,
  */
 static void csr_get_mc_mgmt_cipher(struct mac_context *mac,
 				   struct csr_roam_profile *profile,
-				   tSirBssDescription *bss,
+				   struct bss_description *bss,
 				   tDot11fBeaconIEs *ap_ie)
 {
 	int ret;
@@ -4898,7 +4900,7 @@ static void csr_get_mc_mgmt_cipher(struct mac_context *mac,
 static inline
 void csr_get_mc_mgmt_cipher(struct mac_context *mac,
 			    struct csr_roam_profile *profile,
-			    tSirBssDescription *bss,
+			    struct bss_description *bss,
 			    tDot11fBeaconIEs *ap_ie)
 {
 }
@@ -4909,7 +4911,7 @@ void csr_get_mc_mgmt_cipher(struct mac_context *mac,
  */
 uint8_t csr_retrieve_rsn_ie(struct mac_context *mac, uint32_t sessionId,
 			    struct csr_roam_profile *pProfile,
-			    tSirBssDescription *pSirBssDesc,
+			    struct bss_description *pSirBssDesc,
 			    tDot11fBeaconIEs *pIes, tCsrRSNIe *pRsnIe)
 {
 	uint8_t cbRsnIe = 0;
@@ -4948,7 +4950,7 @@ uint8_t csr_retrieve_rsn_ie(struct mac_context *mac, uint32_t sessionId,
  */
 uint8_t csr_retrieve_wapi_ie(struct mac_context *mac, uint32_t sessionId,
 			     struct csr_roam_profile *pProfile,
-			     tSirBssDescription *pSirBssDesc,
+			     struct bss_description *pSirBssDesc,
 			     tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe)
 {
 	uint8_t cbWapiIe = 0;
@@ -5097,7 +5099,7 @@ static bool csr_validate_wep(struct mac_context *mac_ctx,
 			     eCsrEncryptionType uc_encry_type,
 			     tCsrAuthList *auth_list,
 			     tCsrEncryptionList *mc_encryption_list,
-			     tSirBssDescription *bss_descr,
+			     struct bss_description *bss_descr,
 			     tDot11fBeaconIEs *ie_ptr)
 {
 	uint32_t idx;
@@ -5194,7 +5196,7 @@ static bool csr_validate_wep(struct mac_context *mac_ctx,
  *
  * Return: Boolean value to tell if matched or not.
  */
-static bool csr_validate_open_none(tSirBssDescription *bss_desc,
+static bool csr_validate_open_none(struct bss_description *bss_desc,
 				   tCsrEncryptionList *mc_enc_type,
 				   tCsrAuthList *auth_type)
 {
@@ -5265,7 +5267,7 @@ static bool csr_validate_any_default(struct mac_context *mac_ctx,
 				     uint8_t *mfp_capable,
 				     tDot11fBeaconIEs *ies_ptr,
 				     eCsrAuthType *neg_auth_type,
-				     tSirBssDescription *bss_desc,
+				     struct bss_description *bss_desc,
 				     eCsrEncryptionType *uc_cipher,
 				     eCsrEncryptionType *mc_cipher)
 {
@@ -5362,7 +5364,7 @@ bool csr_is_security_match(struct mac_context *mac_ctx, tCsrAuthList *auth_type,
 			   tCsrEncryptionList *uc_enc_type,
 			   tCsrEncryptionList *mc_enc_type, bool *mfp_enabled,
 			   uint8_t *mfp_required, uint8_t *mfp_capable,
-			   tSirBssDescription *bss_desc,
+			   struct bss_description *bss_desc,
 			   tDot11fBeaconIEs *ies_ptr, uint8_t session_id)
 {
 	bool match = false;
@@ -5371,7 +5373,7 @@ bool csr_is_security_match(struct mac_context *mac_ctx, tCsrAuthList *auth_type,
 	uint16_t ie_len;
 
 	ie_len = (bss_desc->length + sizeof(bss_desc->length) -
-		  GET_FIELD_OFFSET(tSirBssDescription, ieFields));
+		  GET_FIELD_OFFSET(struct bss_description, ieFields));
 
 	for (i = 0; ((i < uc_enc_type->numEntries) && (!match)); i++) {
 		uc_cipher = uc_enc_type->encryptionType[i];

core/sme/src/nan/nan_datapath_api.c

@@ -78,7 +78,7 @@ QDF_STATUS csr_roam_start_ndi(struct mac_context *mac_ctx, uint32_t session,
 void csr_roam_save_ndi_connected_info(struct mac_context *mac_ctx,
 				      uint32_t session_id,
 				      struct csr_roam_profile *roam_profile,
-				      tSirBssDescription *bssdesc)
+				      struct bss_description *bssdesc)
 {
 	struct csr_roam_session *roam_session;
 	tCsrRoamConnectedProfile *connect_profile;

core/sme/src/qos/sme_qos.c

@@ -379,8 +379,11 @@ static QDF_STATUS sme_qos_update_params(uint8_t sessionId,
 				      uint8_t tspec_mask,
 				      struct sme_qos_wmmtspecinfo *pTspec_Info);
 static enum qca_wlan_ac_type sme_qos_up_to_ac(enum sme_qos_wmmuptype up);
-static bool sme_qos_is_acm(struct mac_context *mac, tSirBssDescription *pSirBssDesc,
-		    enum qca_wlan_ac_type ac, tDot11fBeaconIEs *pIes);
+
+static bool
+sme_qos_is_acm(struct mac_context *mac, struct bss_description *pSirBssDesc,
+	       enum qca_wlan_ac_type ac, tDot11fBeaconIEs *pIes);
+
 static tListElem *sme_qos_find_in_flow_list(struct sme_qos_searchinfo
 						search_key);
 static QDF_STATUS sme_qos_find_all_in_flow_list(struct mac_context *mac,
@@ -974,7 +977,7 @@ QDF_STATUS sme_qos_csr_event_ind(struct mac_context *mac,
  * pSirBssDesc - The event occurred of type sme_qos_csr_event_indType.
  * Return a bit mask indicating for which ACs AP has ACM set to 1
  */
-uint8_t sme_qos_get_acm_mask(struct mac_context *mac, tSirBssDescription
+uint8_t sme_qos_get_acm_mask(struct mac_context *mac, struct bss_description
 				*pSirBssDesc, tDot11fBeaconIEs *pIes)
 {
 	enum qca_wlan_ac_type ac;
@@ -5946,8 +5949,9 @@ static QDF_STATUS sme_qos_find_all_in_flow_list(struct mac_context *mac_ctx,
  *
  * Return true if the AC mandates Admission Control
  */
-static bool sme_qos_is_acm(struct mac_context *mac, tSirBssDescription *pSirBssDesc,
-		    enum qca_wlan_ac_type ac, tDot11fBeaconIEs *pIes)
+static bool
+sme_qos_is_acm(struct mac_context *mac, struct bss_description *pSirBssDesc,
+	       enum qca_wlan_ac_type ac, tDot11fBeaconIEs *pIes)
 {
 	bool ret_val = false;
 	tDot11fBeaconIEs *pIesLocal;
@@ -6378,7 +6382,7 @@ static QDF_STATUS sme_qos_delete_buffered_requests(struct mac_context *mac,
 static QDF_STATUS sme_qos_save_assoc_info(struct sme_qos_sessioninfo *pSession,
 				   sme_QosAssocInfo *pAssoc_info)
 {
-	tSirBssDescription *pBssDesc = NULL;
+	struct bss_description *pBssDesc = NULL;
 	uint32_t bssLen = 0;
 
 	if (!pAssoc_info) {

core/wma/src/wma_scan_roam.c

@@ -2829,13 +2829,13 @@ int wma_mlme_roam_synch_event_handler_cb(void *handle, uint8_t *event,
 		WMA_LOGE("LFR3: Invalid Beacon Length");
 		goto cleanup_label;
 	}
-	bss_desc_ptr = qdf_mem_malloc(sizeof(tSirBssDescription) + ie_len);
+	bss_desc_ptr = qdf_mem_malloc(sizeof(struct bss_description) + ie_len);
 	if (!bss_desc_ptr) {
 		QDF_ASSERT(bss_desc_ptr);
 		status = -ENOMEM;
 		goto cleanup_label;
 	}
-	qdf_mem_zero(bss_desc_ptr, sizeof(tSirBssDescription) + ie_len);
+	qdf_mem_zero(bss_desc_ptr, sizeof(struct bss_description) + ie_len);
 	if (QDF_IS_STATUS_ERROR(wma->pe_roam_synch_cb(
 			(struct mac_context *)wma->mac_context,
 			roam_synch_ind_ptr, bss_desc_ptr,