Răsfoiți Sursa

qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSirSmeApNewCaps

Replace tSirMacAddr with cdf_mac_addr in sSirSmeApNewCaps.

Change-Id: I785b2631e149e44835e2cf53d997673b9c5515c0
CRs-Fixed: 898864
Srinivas Girigowda 9 ani în urmă
părinte
comite
999106b34d

+ 1 - 1
core/mac/inc/sir_api.h

@@ -1135,7 +1135,7 @@ typedef struct sSirSmeNewBssInfo {
 
 typedef struct sSirSmeApNewCaps {
 	uint16_t capabilityInfo;
-	tSirMacAddr bssId;
+	struct cdf_mac_addr bssId;
 	uint8_t channelId;
 	uint8_t reserved[3];
 	tSirMacSSid ssId;

+ 2 - 2
core/mac/src/pe/lim/lim_api.c

@@ -1587,8 +1587,8 @@ lim_detect_change_in_ap_capabilities(tpAniSirGlobal pMac,
 		len = sizeof(tSirMacCapabilityInfo) + sizeof(tSirMacAddr) + sizeof(uint8_t) + 3 * sizeof(uint8_t) + /* reserved fields */
 		      pBeacon->ssId.length + 1;
 
-		cdf_mem_copy(apNewCaps.bssId,
-			     psessionEntry->bssId, sizeof(tSirMacAddr));
+		cdf_mem_copy(apNewCaps.bssId.bytes,
+			     psessionEntry->bssId, CDF_MAC_ADDR_SIZE);
 		if (newChannel != psessionEntry->currentOperChannel) {
 			PELOGE(lim_log
 				       (pMac, LOGE,

+ 4 - 3
core/sme/src/csr/csr_api_roam.c

@@ -9965,7 +9965,8 @@ void csr_send_ese_adjacent_ap_rep_ind(tpAniSirGlobal pMac, tCsrRoamSession *pSes
 }
 #endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
 
-CDF_STATUS csr_send_reset_ap_caps_changed(tpAniSirGlobal pMac, tSirMacAddr *bssId)
+static CDF_STATUS csr_send_reset_ap_caps_changed(tpAniSirGlobal pMac,
+				struct cdf_mac_addr *bssId)
 {
 	tpSirResetAPCapsChange pMsg;
 	uint16_t len;
@@ -9982,7 +9983,7 @@ CDF_STATUS csr_send_reset_ap_caps_changed(tpAniSirGlobal pMac, tSirMacAddr *bssI
 		cdf_mem_set(pMsg, sizeof(tSirResetAPCapsChange), 0);
 		pMsg->messageType = eWNI_SME_RESET_AP_CAPS_CHANGED;
 		pMsg->length = len;
-		cdf_mem_copy(pMsg->bssId, bssId, sizeof(tSirMacAddr));
+		cdf_mem_copy(pMsg->bssId, bssId->bytes, CDF_MAC_ADDR_SIZE);
 		sms_log(pMac, LOG1,
 			FL("CSR reset caps change for Bssid= " MAC_ADDRESS_STR),
 			MAC_ADDR_ARRAY(pMsg->bssId));
@@ -10588,7 +10589,7 @@ csr_roam_chk_lnk_wm_status_change_ntf(tpAniSirGlobal mac_ctx,
 		sms_log(mac_ctx, LOGW,
 			FL("CSR handling eSIR_SME_AP_CAPS_CHANGED"));
 		status = csr_roam_get_session_id_from_bssid(mac_ctx,
-				(struct cdf_mac_addr *)pApNewCaps->bssId, &sessionId);
+					&pApNewCaps->bssId, &sessionId);
 		if (!CDF_IS_STATUS_SUCCESS(status))
 			break;
 		if (eCSR_ROAMING_STATE_JOINED ==