Просмотр исходного кода

qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in WowlEnterParams

Replace tSirMacAddr with cdf_mac_addr in WowlEnterParams.

Change-Id: Ifc2edce83693fb01ef4ea642727902d493347225
CRs-Fixed: 898864
Srinivas Girigowda 9 лет назад
Родитель
Сommit
ca40f98808
3 измененных файлов с 9 добавлено и 10 удалено
  1. 3 3
      core/hdd/src/wlan_hdd_wowl.c
  2. 3 3
      core/mac/inc/sir_api.h
  3. 3 4
      core/sme/src/common/sme_power_save.c

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

@@ -522,8 +522,8 @@ bool hdd_enter_wowl(hdd_adapter_t *pAdapter, bool enable_mp, bool enable_pbm)
 	wowParams.ucMagicPktEnable = enable_mp;
 	wowParams.sessionId = pAdapter->sessionId;
 	if (enable_mp) {
-		cdf_copy_macaddr((struct cdf_mac_addr *) &(wowParams.magicPtrn),
-				 &(pAdapter->macAddressCurrent));
+		cdf_copy_macaddr(&wowParams.magic_ptrn,
+				 &pAdapter->macAddressCurrent);
 	}
 #ifdef WLAN_WAKEUP_EVENTS
 	wowParams.ucWoWEAPIDRequestEnable = true;
@@ -533,7 +533,7 @@ bool hdd_enter_wowl(hdd_adapter_t *pAdapter, bool enable_mp, bool enable_pbm)
 	wowParams.ucWoWBSSConnLoss = true;
 #endif /* WLAN_WAKEUP_EVENTS */
 
-	/* Request to put Libra into WoWL */
+	/* Request to put FW into WoWL */
 	cdf_ret_status = sme_enter_wowl(hHal, hdd_wowl_callback, pAdapter,
 #ifdef WLAN_WAKEUP_EVENTS
 					hdd_wowl_wake_indication_callback,

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

@@ -2189,7 +2189,7 @@ typedef struct sSirSmeWowlEnterParams {
 	uint8_t ucMagicPktEnable;
 
 	/* Magic pattern */
-	tSirMacAddr magicPtrn;
+	struct cdf_mac_addr magic_ptrn;
 
 	/* Enables/disables packet pattern filtering */
 	uint8_t ucPatternFilteringEnable;
@@ -2222,7 +2222,7 @@ typedef struct sSirSmeWowlEnterParams {
 	uint8_t ucWoWBSSConnLoss;
 #endif /* WLAN_WAKEUP_EVENTS */
 
-	tSirMacAddr bssId;
+	struct cdf_mac_addr bssid;
 } tSirSmeWowlEnterParams, *tpSirSmeWowlEnterParams;
 
 /* PE<->HAL: Enter WOWLAN parameters */
@@ -2233,7 +2233,7 @@ typedef struct sSirHalWowlEnterParams {
 	uint8_t ucMagicPktEnable;
 
 	/* Magic pattern */
-	tSirMacAddr magicPtrn;
+	struct cdf_mac_addr magic_ptrn;
 
 	/* Enables/disables packet pattern filtering in firmware.
 	   Enabling this flag enables broadcast pattern matching

+ 3 - 4
core/sme/src/common/sme_power_save.c

@@ -248,7 +248,7 @@ CDF_STATUS sme_ps_enter_wowl_req_params(tpAniSirGlobal mac_ctx,
 	hal_wowl_params = cdf_mem_malloc(sizeof(*hal_wowl_params));
 	if (NULL == hal_wowl_params) {
 		sms_log(mac_ctx, LOGP,
-			FL("Fail to allocate memory for Enter Wowl Request "));
+			FL("Fail to allocate memory for Enter Wowl Request"));
 		return  CDF_STATUS_E_NOMEM;
 	}
 	cdf_mem_set((uint8_t *) hal_wowl_params, sizeof(*hal_wowl_params), 0);
@@ -257,9 +257,8 @@ CDF_STATUS sme_ps_enter_wowl_req_params(tpAniSirGlobal mac_ctx,
 	hal_wowl_params->ucMagicPktEnable = sme_wowl_params->ucMagicPktEnable;
 	hal_wowl_params->ucPatternFilteringEnable =
 		sme_wowl_params->ucPatternFilteringEnable;
-	cdf_mem_copy((uint8_t *) hal_wowl_params->magicPtrn,
-			(uint8_t *) sme_wowl_params->magicPtrn,
-			sizeof(tSirMacAddr));
+	cdf_copy_macaddr(&hal_wowl_params->magic_ptrn,
+			 &sme_wowl_params->magic_ptrn);
 
 #ifdef WLAN_WAKEUP_EVENTS
 	hal_wowl_params->ucWoWEAPIDRequestEnable =