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
This commit is contained in:

committed by
Akash Patel

parent
c250b07891
commit
4c9722cde0
@@ -522,8 +522,8 @@ bool hdd_enter_wowl(hdd_adapter_t *pAdapter, bool enable_mp, bool enable_pbm)
|
|||||||
wowParams.ucMagicPktEnable = enable_mp;
|
wowParams.ucMagicPktEnable = enable_mp;
|
||||||
wowParams.sessionId = pAdapter->sessionId;
|
wowParams.sessionId = pAdapter->sessionId;
|
||||||
if (enable_mp) {
|
if (enable_mp) {
|
||||||
cdf_copy_macaddr((struct cdf_mac_addr *) &(wowParams.magicPtrn),
|
cdf_copy_macaddr(&wowParams.magic_ptrn,
|
||||||
&(pAdapter->macAddressCurrent));
|
&pAdapter->macAddressCurrent);
|
||||||
}
|
}
|
||||||
#ifdef WLAN_WAKEUP_EVENTS
|
#ifdef WLAN_WAKEUP_EVENTS
|
||||||
wowParams.ucWoWEAPIDRequestEnable = true;
|
wowParams.ucWoWEAPIDRequestEnable = true;
|
||||||
@@ -533,7 +533,7 @@ bool hdd_enter_wowl(hdd_adapter_t *pAdapter, bool enable_mp, bool enable_pbm)
|
|||||||
wowParams.ucWoWBSSConnLoss = true;
|
wowParams.ucWoWBSSConnLoss = true;
|
||||||
#endif /* WLAN_WAKEUP_EVENTS */
|
#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,
|
cdf_ret_status = sme_enter_wowl(hHal, hdd_wowl_callback, pAdapter,
|
||||||
#ifdef WLAN_WAKEUP_EVENTS
|
#ifdef WLAN_WAKEUP_EVENTS
|
||||||
hdd_wowl_wake_indication_callback,
|
hdd_wowl_wake_indication_callback,
|
||||||
|
@@ -2189,7 +2189,7 @@ typedef struct sSirSmeWowlEnterParams {
|
|||||||
uint8_t ucMagicPktEnable;
|
uint8_t ucMagicPktEnable;
|
||||||
|
|
||||||
/* Magic pattern */
|
/* Magic pattern */
|
||||||
tSirMacAddr magicPtrn;
|
struct cdf_mac_addr magic_ptrn;
|
||||||
|
|
||||||
/* Enables/disables packet pattern filtering */
|
/* Enables/disables packet pattern filtering */
|
||||||
uint8_t ucPatternFilteringEnable;
|
uint8_t ucPatternFilteringEnable;
|
||||||
@@ -2222,7 +2222,7 @@ typedef struct sSirSmeWowlEnterParams {
|
|||||||
uint8_t ucWoWBSSConnLoss;
|
uint8_t ucWoWBSSConnLoss;
|
||||||
#endif /* WLAN_WAKEUP_EVENTS */
|
#endif /* WLAN_WAKEUP_EVENTS */
|
||||||
|
|
||||||
tSirMacAddr bssId;
|
struct cdf_mac_addr bssid;
|
||||||
} tSirSmeWowlEnterParams, *tpSirSmeWowlEnterParams;
|
} tSirSmeWowlEnterParams, *tpSirSmeWowlEnterParams;
|
||||||
|
|
||||||
/* PE<->HAL: Enter WOWLAN parameters */
|
/* PE<->HAL: Enter WOWLAN parameters */
|
||||||
@@ -2233,7 +2233,7 @@ typedef struct sSirHalWowlEnterParams {
|
|||||||
uint8_t ucMagicPktEnable;
|
uint8_t ucMagicPktEnable;
|
||||||
|
|
||||||
/* Magic pattern */
|
/* Magic pattern */
|
||||||
tSirMacAddr magicPtrn;
|
struct cdf_mac_addr magic_ptrn;
|
||||||
|
|
||||||
/* Enables/disables packet pattern filtering in firmware.
|
/* Enables/disables packet pattern filtering in firmware.
|
||||||
Enabling this flag enables broadcast pattern matching
|
Enabling this flag enables broadcast pattern matching
|
||||||
|
@@ -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));
|
hal_wowl_params = cdf_mem_malloc(sizeof(*hal_wowl_params));
|
||||||
if (NULL == hal_wowl_params) {
|
if (NULL == hal_wowl_params) {
|
||||||
sms_log(mac_ctx, LOGP,
|
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;
|
return CDF_STATUS_E_NOMEM;
|
||||||
}
|
}
|
||||||
cdf_mem_set((uint8_t *) hal_wowl_params, sizeof(*hal_wowl_params), 0);
|
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->ucMagicPktEnable = sme_wowl_params->ucMagicPktEnable;
|
||||||
hal_wowl_params->ucPatternFilteringEnable =
|
hal_wowl_params->ucPatternFilteringEnable =
|
||||||
sme_wowl_params->ucPatternFilteringEnable;
|
sme_wowl_params->ucPatternFilteringEnable;
|
||||||
cdf_mem_copy((uint8_t *) hal_wowl_params->magicPtrn,
|
cdf_copy_macaddr(&hal_wowl_params->magic_ptrn,
|
||||||
(uint8_t *) sme_wowl_params->magicPtrn,
|
&sme_wowl_params->magic_ptrn);
|
||||||
sizeof(tSirMacAddr));
|
|
||||||
|
|
||||||
#ifdef WLAN_WAKEUP_EVENTS
|
#ifdef WLAN_WAKEUP_EVENTS
|
||||||
hal_wowl_params->ucWoWEAPIDRequestEnable =
|
hal_wowl_params->ucWoWEAPIDRequestEnable =
|
||||||
|
Reference in New Issue
Block a user