Forráskód Böngészése

qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSirScanOffloadReq

Replace tSirMacAddr with cdf_mac_addr in sSirScanOffloadReq.

Change-Id: Ia42f230491b0500f612c983c5769401249b6d961
CRs-Fixed: 898864
Srinivas Girigowda 9 éve
szülő
commit
1d999304e6

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

@@ -3497,11 +3497,11 @@ typedef struct sAniHandoffReq {
 
 typedef struct sSirScanOffloadReq {
 	uint8_t sessionId;
-	tSirMacAddr bssId;
+	struct cdf_mac_addr bssId;
 	uint8_t numSsid;
 	tSirMacSSid ssId[SIR_SCAN_MAX_NUM_SSID];
 	uint8_t hiddenSsid;
-	tSirMacAddr selfMacAddr;
+	struct cdf_mac_addr selfMacAddr;
 	tSirBssType bssType;
 	uint8_t dot11mode;
 	tSirScanType scanType;

+ 3 - 7
core/mac/src/pe/lim/lim_p2p.c

@@ -84,8 +84,6 @@ static CDF_STATUS lim_send_hal_req_remain_on_chan_offload(tpAniSirGlobal pMac,
 	tSirScanOffloadReq *pScanOffloadReq;
 	tSirMsgQ msg;
 	tSirRetStatus rc = eSIR_SUCCESS;
-	uint8_t bssid[CDF_MAC_ADDR_SIZE] =
-	{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 
 	pScanOffloadReq = cdf_mem_malloc(sizeof(tSirScanOffloadReq));
 	if (NULL == pScanOffloadReq) {
@@ -100,12 +98,10 @@ static CDF_STATUS lim_send_hal_req_remain_on_chan_offload(tpAniSirGlobal pMac,
 	msg.bodyptr = pScanOffloadReq;
 	msg.bodyval = 0;
 
-	cdf_mem_copy((uint8_t *) pScanOffloadReq->selfMacAddr,
-		     (uint8_t *) pRemOnChnReq->selfMacAddr.bytes,
-		     CDF_MAC_ADDR_SIZE);
+	cdf_copy_macaddr(&pScanOffloadReq->selfMacAddr,
+			 &pRemOnChnReq->selfMacAddr);
 
-	cdf_mem_copy((uint8_t *) pScanOffloadReq->bssId,
-		     (uint8_t *) bssid, sizeof(tSirMacAddr));
+	cdf_set_macaddr_broadcast(&pScanOffloadReq->bssId);
 	pScanOffloadReq->scanType = eSIR_PASSIVE_SCAN;
 	pScanOffloadReq->p2pScanType = P2P_SCAN_TYPE_LISTEN;
 	pScanOffloadReq->minChannelTime = pRemOnChnReq->duration;

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

@@ -1279,8 +1279,8 @@ static CDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac,
 	msg.bodyptr = pScanOffloadReq;
 	msg.bodyval = 0;
 
-	cdf_mem_copy((uint8_t *) pScanOffloadReq->bssId,
-		     (uint8_t *) pScanReq->bssId, sizeof(tSirMacAddr));
+	cdf_mem_copy((uint8_t *) pScanOffloadReq->bssId.bytes,
+		     (uint8_t *) pScanReq->bssId, CDF_MAC_ADDR_SIZE);
 
 	if (pScanReq->numSsid > SIR_SCAN_MAX_NUM_SSID) {
 		lim_log(pMac, LOGE,
@@ -1299,8 +1299,8 @@ static CDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac,
 	}
 
 	pScanOffloadReq->hiddenSsid = pScanReq->hiddenSsid;
-	cdf_mem_copy((uint8_t *) pScanOffloadReq->selfMacAddr,
-		     (uint8_t *) pScanReq->selfMacAddr, sizeof(tSirMacAddr));
+	cdf_mem_copy((uint8_t *) pScanOffloadReq->selfMacAddr.bytes,
+		     (uint8_t *) pScanReq->selfMacAddr, CDF_MAC_ADDR_SIZE);
 	pScanOffloadReq->bssType = pScanReq->bssType;
 	pScanOffloadReq->dot11mode = pScanReq->dot11mode;
 	pScanOffloadReq->scanType = pScanReq->scanType;

+ 1 - 1
core/wma/src/wma_scan_roam.c

@@ -507,7 +507,7 @@ CDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle,
 	WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_FIXED_STRUC,
 		       (cmd->num_bssid * sizeof(wmi_mac_addr)));
 	bssid = (wmi_mac_addr *) (buf_ptr + WMI_TLV_HDR_SIZE);
-	WMI_CHAR_ARRAY_TO_MAC_ADDR(scan_req->bssId, bssid);
+	WMI_CHAR_ARRAY_TO_MAC_ADDR(scan_req->bssId.bytes, bssid);
 	buf_ptr += WMI_TLV_HDR_SIZE + (cmd->num_bssid * sizeof(wmi_mac_addr));
 
 	cmd->ie_len = scan_req->uIEFieldLen;