qcacld-3.0: Converge on struct mobility_domain_info

The driver currently defines three different data structures to hold
mobility domain information:
- tSirMobilityDomainInfo
- tCsrMobilityDomainInfo
- struct mobility_domain_info

To align with the converged software architecture remove the two
legacy typedefs and exclusively use the unified WMI structure.

Change-Id: I317b90e47c3db8b74a76c297f6bc42301fa2f80e
CRs-Fixed: 2369476

core/mac/inc/sir_api.h

@@ -2246,11 +2246,6 @@ typedef struct {
 
 } tSirRoamNetworkType;
 
-typedef struct SirMobilityDomainInfo {
-	uint8_t mdiePresent;
-	uint16_t mobilityDomain;
-} tSirMobilityDomainInfo;
-
 typedef enum {
 	SIR_ROAMING_DFS_CHANNEL_DISABLED = 0,
 	SIR_ROAMING_DFS_CHANNEL_ENABLED_NORMAL = 1,
@@ -2398,7 +2393,7 @@ typedef struct sSirRoamOffloadScanReq {
 	uint8_t nProbes;
 	uint16_t HomeAwayTime;
 	tSirRoamNetworkType ConnectedNetwork;
-	tSirMobilityDomainInfo MDID;
+	struct mobility_domain_info mdid;
 	uint8_t sessionId;
 	uint8_t RoamBmissFirstBcnt;
 	uint8_t RoamBmissFinalBcnt;

core/sme/inc/csr_api.h

@@ -279,11 +279,6 @@ typedef struct tagCsrAuthList {
 	eCsrAuthType authType[eCSR_NUM_OF_SUPPORT_AUTH_TYPE];
 } tCsrAuthList, *tpCsrAuthList;
 
-typedef struct tagCsrMobilityDomainInfo {
-	uint8_t mdiePresent;
-	uint16_t mobilityDomain;
-} tCsrMobilityDomainInfo;
-
 #ifdef FEATURE_WLAN_ESE
 typedef struct tagCsrEseCckmInfo {
 	uint32_t reassoc_req_num;
@@ -333,7 +328,7 @@ typedef struct tagCsrScanResultFilter {
 	 * BSSID and channel is considered for filtering.
 	 */
 	bool fMeasurement;
-	tCsrMobilityDomainInfo MDID;
+	struct mobility_domain_info mdid;
 	bool p2pResult;
 #ifdef WLAN_FEATURE_11W
 	/* Management Frame Protection */
@@ -868,7 +863,7 @@ struct csr_roam_profile {
 	bool chan_switch_hostapd_rate_enabled;
 	uint16_t cfg_protection;
 	uint8_t wps_state;
-	tCsrMobilityDomainInfo MDID;
+	struct mobility_domain_info mdid;
 	enum QDF_OPMODE csrPersona;
 	/* addIe params */
 	tSirAddIeParams addIeParams;
@@ -934,7 +929,7 @@ typedef struct tagCsrRoamConnectedProfile {
 	uint8_t *pAddIEAssoc;
 	tSirBssDescription *pBssDesc;
 	bool qap;               /* AP supports QoS */
-	tCsrMobilityDomainInfo MDID;
+	struct mobility_domain_info mdid;
 #ifdef FEATURE_WLAN_ESE
 	tCsrEseCckmInfo eseCckmInfo;
 	bool isESEAssoc;

core/sme/src/csr/csr_api_roam.c

@@ -1480,14 +1480,7 @@ QDF_STATUS csr_roam_copy_connect_profile(struct mac_context *mac,
 			sizeof(struct qdf_mac_addr));
 		qdf_mem_copy(&pProfile->SSID, &connected_prof->SSID,
 			sizeof(tSirMacSSid));
-		if (connected_prof->MDID.mdiePresent) {
-			pProfile->MDID.mdiePresent = 1;
-			pProfile->MDID.mobilityDomain =
-				connected_prof->MDID.mobilityDomain;
-		} else {
-			pProfile->MDID.mdiePresent = 0;
-			pProfile->MDID.mobilityDomain = 0;
-		}
+		pProfile->mdid = connected_prof->mdid;
 #ifdef FEATURE_WLAN_ESE
 		pProfile->isESEAssoc = connected_prof->isESEAssoc;
 		if (csr_is_auth_type_ese(connected_prof->AuthType)) {
@@ -7577,11 +7570,7 @@ QDF_STATUS csr_roam_copy_profile(struct mac_context *mac,
 	pDstProfile->MFPRequired = pSrcProfile->MFPRequired;
 	pDstProfile->MFPCapable = pSrcProfile->MFPCapable;
 #endif
-	if (pSrcProfile->MDID.mdiePresent) {
-		pDstProfile->MDID.mdiePresent = 1;
-		pDstProfile->MDID.mobilityDomain =
-			pSrcProfile->MDID.mobilityDomain;
-	}
+	pDstProfile->mdid = pSrcProfile->mdid;
 	qdf_mem_copy(&pDstProfile->addIeParams, &pSrcProfile->addIeParams,
 			sizeof(tSirAddIeParams));
 
@@ -7684,11 +7673,7 @@ QDF_STATUS csr_roam_copy_connected_profile(struct mac_context *mac,
 	pDstProfile->BSSType = pSrcProfile->BSSType;
 	qdf_mem_copy(&pDstProfile->Keys, &pSrcProfile->Keys,
 		sizeof(pDstProfile->Keys));
-	if (pSrcProfile->MDID.mdiePresent) {
-		pDstProfile->MDID.mdiePresent = 1;
-		pDstProfile->MDID.mobilityDomain =
-			pSrcProfile->MDID.mobilityDomain;
-	}
+	pDstProfile->mdid = pSrcProfile->mdid;
 #ifdef WLAN_FEATURE_11W
 	pDstProfile->MFPEnabled = pSrcProfile->MFPEnabled;
 	pDstProfile->MFPRequired = pSrcProfile->MFPRequired;
@@ -8521,8 +8506,8 @@ QDF_STATUS csr_roam_save_connected_information(struct mac_context *mac,
 		sme_err("ERROR: Beacon interval is ZERO");
 	csr_get_bss_id_bss_desc(pSirBssDesc, &pConnectProfile->bssid);
 	if (pSirBssDesc->mdiePresent) {
-		pConnectProfile->MDID.mdiePresent = 1;
-		pConnectProfile->MDID.mobilityDomain =
+		pConnectProfile->mdid.mdie_present = 1;
+		pConnectProfile->mdid.mobility_domain =
 			(pSirBssDesc->mdie[1] << 8) | (pSirBssDesc->mdie[0]);
 	}
 	if (NULL == pIesTemp)
@@ -10379,10 +10364,7 @@ csr_roam_prepare_filter_from_profile(struct mac_context *mac_ctx,
 		qdf_mem_copy(scan_fltr->countryCode, profile->countryCode,
 			     WNI_CFG_COUNTRY_CODE_LEN);
 	}
-	if (profile->MDID.mdiePresent) {
-		scan_fltr->MDID.mdiePresent = 1;
-		scan_fltr->MDID.mobilityDomain = profile->MDID.mobilityDomain;
-	}
+	scan_fltr->mdid = profile->mdid;
 	qdf_mem_copy(scan_fltr->bssid_hint.bytes,
 		profile->bssid_hint.bytes, QDF_MAC_ADDR_SIZE);
 
@@ -12824,9 +12806,9 @@ bool csr_is_same_profile(struct mac_context *mac,
 		fCheck = false;
 		goto free_scan_filter;
 	}
-	if (pProfile1->MDID.mdiePresent || pProfile2->MDID.mdiePresent) {
-		if (pProfile1->MDID.mobilityDomain
-			!= pProfile2->MDID.mobilityDomain) {
+	if (pProfile1->mdid.mdie_present || pProfile2->mdid.mdie_present) {
+		if (pProfile1->mdid.mobility_domain !=
+		    pProfile2->mdid.mobility_domain) {
 			fCheck = false;
 			goto free_scan_filter;
 		}
@@ -14916,7 +14898,7 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId,
 #ifdef FEATURE_WLAN_ESE
 		ese_config =  mac->mlme_cfg->lfr.ese_enabled;
 #endif
-		pProfile->MDID.mdiePresent = pBssDescription->mdiePresent;
+		pProfile->mdid.mdie_present = pBssDescription->mdiePresent;
 		if (csr_is_profile11r(mac, pProfile)
 #ifdef FEATURE_WLAN_ESE
 		    &&
@@ -17740,12 +17722,8 @@ csr_create_roam_scan_offload_request(struct mac_context *mac_ctx,
 		  req_buf->ChannelCacheType,
 		  req_buf->ConnectedNetwork.ChannelCount, ch_cache_str);
 
-	req_buf->MDID.mdiePresent =
-		mac_ctx->roam.roamSession[session_id].
-		connectedProfile.MDID.mdiePresent;
-	req_buf->MDID.mobilityDomain =
-		mac_ctx->roam.roamSession[session_id].
-		connectedProfile.MDID.mobilityDomain;
+	req_buf->mdid =
+		mac_ctx->roam.roamSession[session_id].connectedProfile.mdid;
 	req_buf->sessionId = session_id;
 	req_buf->nProbes = mac_ctx->mlme_cfg->lfr.roam_scan_n_probes;
 	req_buf->HomeAwayTime = mac_ctx->mlme_cfg->lfr.roam_scan_home_away_time;

core/sme/src/csr/csr_api_scan.c

@@ -2505,15 +2505,15 @@ static QDF_STATUS csr_prepare_scan_filter(struct mac_context *mac_ctx,
 			  csr_covert_enc_type_new(
 			  pFilter->mcEncryptionType.encryptionType[i]);
 	}
-	qdf_mem_copy(filter->country,
-		pFilter->countryCode, WNI_CFG_COUNTRY_CODE_LEN);
+	qdf_mem_copy(filter->country, pFilter->countryCode,
+		     WNI_CFG_COUNTRY_CODE_LEN);
 
 	if (pFilter->bWPSAssociation || pFilter->bOSENAssociation)
 		filter->ignore_auth_enc_type = true;
 
 	filter->rrm_measurement_filter = pFilter->fMeasurement;
 
-	filter->mobility_domain = pFilter->MDID.mobilityDomain;
+	filter->mobility_domain = pFilter->mdid.mobility_domain;
 
 	filter->p2p_results = pFilter->p2pResult;
 

core/sme/src/csr/csr_neighbor_roam.c

@@ -462,15 +462,12 @@ csr_neighbor_roam_prepare_scan_profile_filter(struct mac_context *mac,
 		pScanFilter->ChannelInfo.ChannelList = NULL;
 	}
 
-	if (nbr_roam_info->is11rAssoc) {
+	if (nbr_roam_info->is11rAssoc)
 		/*
 		 * MDIE should be added as a part of profile. This should be
 		 * added as a part of filter as well
 		 */
-		pScanFilter->MDID.mdiePresent = pCurProfile->MDID.mdiePresent;
-		pScanFilter->MDID.mobilityDomain =
-			pCurProfile->MDID.mobilityDomain;
-	}
+		pScanFilter->mdid = pCurProfile->mdid;
 
 #ifdef WLAN_FEATURE_11W
 	pScanFilter->MFPEnabled = pCurProfile->MFPEnabled;
@@ -994,7 +991,7 @@ static void csr_neighbor_roam_info_ctx_init(
 	/* Based on the auth scheme tell if we are 11r */
 	if (csr_is_auth_type11r
 		(mac, session->connectedProfile.AuthType,
-		session->connectedProfile.MDID.mdiePresent)) {
+		session->connectedProfile.mdid.mdie_present)) {
 		if (mac->mlme_cfg->lfr.fast_transition_enabled)
 			init_ft_flag = true;
 		ngbr_roam_info->is11rAssoc = true;

core/sme/src/csr/csr_util.c

@@ -2587,7 +2587,7 @@ bool csr_is_profile11r(struct mac_context *mac,
 			struct csr_roam_profile *pProfile)
 {
 	return csr_is_auth_type11r(mac, pProfile->negotiatedAuthType,
-				   pProfile->MDID.mdiePresent);
+				   pProfile->mdid.mdie_present);
 }
 
 bool csr_is_auth_type_ese(eCsrAuthType AuthType)

core/wma/src/wma_scan_roam.c

@@ -389,8 +389,7 @@ QDF_STATUS wma_roam_scan_offload_mode(tp_wma_handle wma_handle,
 				roam_req->roam_trigger_reason_bitmask;
 		params->is_ese_assoc = roam_req->IsESEAssoc;
 		params->is_11r_assoc = roam_req->is_11r_assoc;
-		params->mdid.mdie_present = roam_req->MDID.mdiePresent;
-		params->mdid.mobility_domain = roam_req->MDID.mobilityDomain;
+		params->mdid = roam_req->mdid;
 		params->assoc_ie_length = roam_req->assoc_ie.length;
 		qdf_mem_copy(params->assoc_ie, roam_req->assoc_ie.addIEdata,
 						roam_req->assoc_ie.length);