Bladeren bron

qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSirPlmReq

Replace tSirMacAddr with cdf_mac_addr in sSirPlmReq.

Change-Id: I21df91d980bc081af28f67a344d138b3c54eaf14
CRs-Fixed: 898864
Srinivas Girigowda 9 jaren geleden
bovenliggende
commit
5146deef9f
3 gewijzigde bestanden met toevoegingen van 5 en 5 verwijderingen
  1. 3 3
      core/hdd/src/wlan_hdd_ioctl.c
  2. 1 1
      core/mac/inc/sir_api.h
  3. 1 1
      core/wma/src/wma_scan_roam.c

+ 3 - 3
core/hdd/src/wlan_hdd_ioctl.c

@@ -1510,11 +1510,11 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest)
 			if (ret < 0)
 				return CDF_STATUS_E_FAILURE;
 
-			pPlmRequest->macAddr[count] = content;
+			pPlmRequest->mac_addr.bytes[count] = content;
 		}
 
-		hddLog(CDF_TRACE_LEVEL_DEBUG, "MC addr " MAC_ADDRESS_STR,
-		       MAC_ADDR_ARRAY(pPlmRequest->macAddr));
+		hdd_debug("MC addr " MAC_ADDRESS_STR,
+		       MAC_ADDR_ARRAY(pPlmRequest->mac_addr.bytes));
 
 		cmdPtr = strpbrk(cmdPtr, " ");
 

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

@@ -2021,7 +2021,7 @@ typedef struct sSirPlmReq {
 	/* no of times the STA should cycle through PLM ch list */
 	uint8_t burstLen;
 	tPowerdBm desiredTxPwr; /* desired tx power */
-	tSirMacAddr macAddr;    /* MC dest addr */
+	struct cdf_mac_addr mac_addr;    /* MC dest addr */
 	/* no of channels */
 	uint8_t plmNumCh;
 	/* channel numbers */

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

@@ -3780,7 +3780,7 @@ CDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm)
 	cmd->off_duration = plm->measDuration;
 	cmd->burst_cycle = plm->burstLen;
 	cmd->tx_power = plm->desiredTxPwr;
-	WMI_CHAR_ARRAY_TO_MAC_ADDR(plm->macAddr, &cmd->dest_mac);
+	WMI_CHAR_ARRAY_TO_MAC_ADDR(plm->mac_addr.bytes, &cmd->dest_mac);
 	cmd->num_chans = plm->plmNumCh;
 
 	buf_ptr += sizeof(wmi_vdev_plmreq_start_cmd_fixed_param);