From ca40f98808f250f34984ecb94badb1e20d7cd3fb Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Wed, 25 Nov 2015 12:31:44 -0800 Subject: [PATCH] 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 --- core/hdd/src/wlan_hdd_wowl.c | 6 +++--- core/mac/inc/sir_api.h | 6 +++--- core/sme/src/common/sme_power_save.c | 7 +++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/core/hdd/src/wlan_hdd_wowl.c b/core/hdd/src/wlan_hdd_wowl.c index 1c2ff5789ae7..2901e1c2d207 100644 --- a/core/hdd/src/wlan_hdd_wowl.c +++ b/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, diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 9e1501fc4ba8..5c6454451080 100644 --- a/core/mac/inc/sir_api.h +++ b/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 diff --git a/core/sme/src/common/sme_power_save.c b/core/sme/src/common/sme_power_save.c index b12bd4d004e3..8158218a0750 100644 --- a/core/sme/src/common/sme_power_save.c +++ b/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 =