Sfoglia il codice sorgente

qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSirDelts Req/Rsp

Replace tSirMacAddr with cdf_mac_addr in struct sSirDelts Req/Rsp.

Change-Id: I66f2b191b1eb823d395f70fc2c66697b377c7482
CRs-Fixed: 898864
Srinivas Girigowda 9 anni fa
parent
commit
bab88935f0

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

@@ -1996,9 +1996,9 @@ typedef struct sSirDeltsReq {
 	uint16_t length;
 	uint8_t sessionId;      /* Session ID */
 	uint16_t transactionId;
-	tSirMacAddr bssId;      /* BSSID */
+	struct cdf_mac_addr bssid;      /* BSSID */
 	uint16_t aid;           /* use 0 if macAddr is being specified */
-	tSirMacAddr macAddr;    /* only on AP to specify the STA */
+	struct cdf_mac_addr macaddr;    /* only on AP to specify the STA */
 	uint8_t rspReqd;
 	tSirDeltsReqInfo req;
 } tSirDeltsReq, *tpSirDeltsReq;
@@ -2010,7 +2010,7 @@ typedef struct sSirDeltsRsp {
 	uint16_t transactionId; /* sme transaction Id - for BT-AMP Support */
 	uint32_t rc;
 	uint16_t aid;           /* use 0 if macAddr is being specified */
-	tSirMacAddr macAddr;    /* only on AP to specify the STA */
+	struct cdf_mac_addr macaddr;    /* only on AP to specify the STA */
 	tSirDeltsReqInfo rsp;
 } tSirDeltsRsp, *tpSirDeltsRsp;
 

+ 1 - 1
core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -3881,7 +3881,7 @@ static void __lim_process_sme_delts_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
 			     &smetransactionId);
 
 	psessionEntry = pe_find_session_by_bssid(pMac,
-				pDeltsReq->bssId,
+				pDeltsReq->bssid.bytes,
 				&sessionId);
 	if (psessionEntry == NULL) {
 		lim_log(pMac, LOGE, "Session Does not exist for given bssId");

+ 1 - 2
core/mac/src/pe/lim/lim_send_sme_rsp_messages.c

@@ -1783,8 +1783,7 @@ lim_send_sme_delts_rsp(tpAniSirGlobal pMac, tpSirDeltsReq delts, uint32_t status
 	if (psessionEntry != NULL) {
 
 		rsp->aid = delts->aid;
-		cdf_mem_copy((uint8_t *) &rsp->macAddr[0],
-			     (uint8_t *) &delts->macAddr[0], 6);
+		cdf_copy_macaddr(&rsp->macaddr, &delts->macaddr);
 		cdf_mem_copy((uint8_t *) &rsp->rsp, (uint8_t *) &delts->req,
 			     sizeof(tSirDeltsReqInfo));
 	}

+ 1 - 1
core/mac/src/pe/lim/lim_utils.c

@@ -5209,7 +5209,7 @@ lim_validate_delts_req(tpAniSirGlobal mac_ctx, tpSirDeltsReq delts_req,
 					&psession_entry->dph.dphHashTable);
 		else
 			sta = dph_lookup_hash_entry(mac_ctx,
-						delts_req->macAddr,
+						delts_req->macaddr.bytes,
 						&associd,
 						&psession_entry->dph.
 							dphHashTable);

+ 1 - 1
core/sme/src/qos/sme_qos.c

@@ -4075,7 +4075,7 @@ CDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac,
 		cdf_mem_free(pMsg);
 		return CDF_STATUS_E_FAILURE;
 	}
-	cdf_mem_copy(&pMsg->bssId[0],
+	cdf_mem_copy(&pMsg->bssid.bytes[0],
 		     &pSession->assocInfo.pBssDesc->bssId[0],
 		     sizeof(struct cdf_mac_addr));