mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-14 08:36:12 -04:00
Merge "qcacld-3.0: Remove obsolete WOWL messaging" into wlan-cld3.driver.lnx.2.0
This commit is contained in:
commit
7a3658671d
11 changed files with 7 additions and 292 deletions
1
Kbuild
1
Kbuild
|
|
@ -1860,7 +1860,6 @@ CDEFINES := -DANI_OS_TYPE_ANDROID=6 \
|
|||
-DWLAN_FEATURE_PACKET_FILTERING \
|
||||
-DWLAN_NS_OFFLOAD \
|
||||
-DWLAN_SOFTAP_VSTA_FEATURE \
|
||||
-DWLAN_WAKEUP_EVENTS \
|
||||
-DFEATURE_WLAN_RA_FILTERING\
|
||||
-DFEATURE_WLAN_LPHB \
|
||||
-DQCA_SUPPORT_TX_THROTTLE \
|
||||
|
|
|
|||
|
|
@ -2208,162 +2208,6 @@ typedef struct sSmeCsaOffloadInd {
|
|||
struct qdf_mac_addr bssid; /* BSSID */
|
||||
} tSmeCsaOffloadInd, *tpSmeCsaOffloadInd;
|
||||
|
||||
/* SME->PE: Enter WOWLAN parameters */
|
||||
typedef struct sSirSmeWowlEnterParams {
|
||||
uint8_t sessionId;
|
||||
|
||||
/* Enables/disables magic packet filtering */
|
||||
uint8_t ucMagicPktEnable;
|
||||
|
||||
/* Magic pattern */
|
||||
struct qdf_mac_addr magic_ptrn;
|
||||
|
||||
/* Enables/disables packet pattern filtering */
|
||||
uint8_t ucPatternFilteringEnable;
|
||||
|
||||
#ifdef WLAN_WAKEUP_EVENTS
|
||||
/*
|
||||
* This configuration directs the WoW packet filtering to look at EAP-ID
|
||||
* requests embedded in EAPOL frames and use this as a wake source.
|
||||
*/
|
||||
uint8_t ucWoWEAPIDRequestEnable;
|
||||
|
||||
/*
|
||||
* This configuration directs the WoW packet filtering to look for
|
||||
* EAPOL-4WAY requests and use this as a wake source.
|
||||
*/
|
||||
uint8_t ucWoWEAPOL4WayEnable;
|
||||
|
||||
/*
|
||||
* This configuration allows a host wakeup on an network scan
|
||||
* offload match.
|
||||
*/
|
||||
uint8_t ucWowNetScanOffloadMatch;
|
||||
|
||||
/* This configuration allows a host wakeup on any GTK rekeying error.
|
||||
*/
|
||||
uint8_t ucWowGTKRekeyError;
|
||||
|
||||
/* This configuration allows a host wakeup on BSS connection loss.
|
||||
*/
|
||||
uint8_t ucWoWBSSConnLoss;
|
||||
#endif /* WLAN_WAKEUP_EVENTS */
|
||||
|
||||
struct qdf_mac_addr bssid;
|
||||
} tSirSmeWowlEnterParams, *tpSirSmeWowlEnterParams;
|
||||
|
||||
/* PE<->HAL: Enter WOWLAN parameters */
|
||||
typedef struct sSirHalWowlEnterParams {
|
||||
uint8_t sessionId;
|
||||
|
||||
/* Enables/disables magic packet filtering */
|
||||
uint8_t ucMagicPktEnable;
|
||||
|
||||
/* Magic pattern */
|
||||
struct qdf_mac_addr magic_ptrn;
|
||||
|
||||
/* Enables/disables packet pattern filtering in firmware.
|
||||
Enabling this flag enables broadcast pattern matching
|
||||
in Firmware. If unicast pattern matching is also desired,
|
||||
ucUcastPatternFilteringEnable flag must be set tot true
|
||||
as well
|
||||
*/
|
||||
uint8_t ucPatternFilteringEnable;
|
||||
|
||||
/* Enables/disables unicast packet pattern filtering.
|
||||
This flag specifies whether we want to do pattern match
|
||||
on unicast packets as well and not just broadcast packets.
|
||||
This flag has no effect if the ucPatternFilteringEnable
|
||||
(main controlling flag) is set to false
|
||||
*/
|
||||
uint8_t ucUcastPatternFilteringEnable;
|
||||
|
||||
/* This configuration is valid only when magicPktEnable=1.
|
||||
* It requests hardware to wake up when it receives the
|
||||
* Channel Switch Action Frame.
|
||||
*/
|
||||
uint8_t ucWowChnlSwitchRcv;
|
||||
|
||||
/* This configuration is valid only when magicPktEnable=1.
|
||||
* It requests hardware to wake up when it receives the
|
||||
* Deauthentication Frame.
|
||||
*/
|
||||
uint8_t ucWowDeauthRcv;
|
||||
|
||||
/* This configuration is valid only when magicPktEnable=1.
|
||||
* It requests hardware to wake up when it receives the
|
||||
* Disassociation Frame.
|
||||
*/
|
||||
uint8_t ucWowDisassocRcv;
|
||||
|
||||
/* This configuration is valid only when magicPktEnable=1.
|
||||
* It requests hardware to wake up when it has missed
|
||||
* consecutive beacons. This is a hardware register
|
||||
* configuration (NOT a firmware configuration).
|
||||
*/
|
||||
uint8_t ucWowMaxMissedBeacons;
|
||||
|
||||
/* This configuration is valid only when magicPktEnable=1.
|
||||
* This is a timeout value in units of microsec. It requests
|
||||
* hardware to unconditionally wake up after it has stayed
|
||||
* in WoWLAN mode for some time. Set 0 to disable this feature.
|
||||
*/
|
||||
uint8_t ucWowMaxSleepUsec;
|
||||
|
||||
#ifdef WLAN_WAKEUP_EVENTS
|
||||
/* This config directs the WoW pkt filtering to look for EAP-ID
|
||||
* requests embedded in EAPOL frames and use this as a wake source.
|
||||
*/
|
||||
uint8_t ucWoWEAPIDRequestEnable;
|
||||
|
||||
/* This config directs the WoW pkt filtering to look for EAPOL-4WAY
|
||||
* requests and use this as a wake source.
|
||||
*/
|
||||
uint8_t ucWoWEAPOL4WayEnable;
|
||||
|
||||
/* This config allows a host wakeup on an network scan offload match.
|
||||
*/
|
||||
uint8_t ucWowNetScanOffloadMatch;
|
||||
|
||||
/* This configuration allows a host wakeup on any GTK rekeying error.
|
||||
*/
|
||||
uint8_t ucWowGTKRekeyError;
|
||||
|
||||
/* This configuration allows a host wakeup on BSS connection loss.
|
||||
*/
|
||||
uint8_t ucWoWBSSConnLoss;
|
||||
#endif /* WLAN_WAKEUP_EVENTS */
|
||||
|
||||
/* Status code to be filled by HAL when it sends
|
||||
* SIR_HAL_WOWL_ENTER_RSP to PE.
|
||||
*/
|
||||
QDF_STATUS status;
|
||||
|
||||
/*BSSID to find the current session
|
||||
*/
|
||||
uint8_t bssIdx;
|
||||
} tSirHalWowlEnterParams, *tpSirHalWowlEnterParams;
|
||||
|
||||
/* SME->PE: Exit WOWLAN parameters */
|
||||
typedef struct sSirSmeWowlExitParams {
|
||||
uint8_t sessionId;
|
||||
|
||||
} tSirSmeWowlExitParams, *tpSirSmeWowlExitParams;
|
||||
|
||||
/* PE<->HAL: Exit WOWLAN parameters */
|
||||
typedef struct sSirHalWowlExitParams {
|
||||
uint8_t sessionId;
|
||||
|
||||
/* Status code to be filled by HAL when it sends
|
||||
* SIR_HAL_WOWL_EXIT_RSP to PE.
|
||||
*/
|
||||
QDF_STATUS status;
|
||||
|
||||
/*BSSIDX to find the current session
|
||||
*/
|
||||
uint8_t bssIdx;
|
||||
} tSirHalWowlExitParams, *tpSirHalWowlExitParams;
|
||||
|
||||
#define SIR_MAX_NAME_SIZE 64
|
||||
#define SIR_MAX_TEXT_SIZE 32
|
||||
|
||||
|
|
@ -3303,28 +3147,6 @@ struct sir_antenna_mode_resp {
|
|||
enum set_antenna_mode_status status;
|
||||
};
|
||||
|
||||
#ifdef WLAN_WAKEUP_EVENTS
|
||||
/*---------------------------------------------------------------------------
|
||||
tSirWakeReasonInd
|
||||
---------------------------------------------------------------------------*/
|
||||
typedef struct {
|
||||
uint16_t mesgType;
|
||||
uint16_t mesgLen;
|
||||
uint32_t ulReason; /* see tWakeReasonType */
|
||||
uint32_t ulReasonArg; /* argument specific to the reason type */
|
||||
/* length of optional data stored in this message, in case
|
||||
* HAL truncates the data (i.e. data packets) this length
|
||||
* will be less than the actual length
|
||||
*/
|
||||
uint32_t ulStoredDataLen;
|
||||
uint32_t ulActualDataLen; /* actual length of data */
|
||||
/* variable length start of data (length == storedDataLen)
|
||||
* see specific wake type
|
||||
*/
|
||||
uint8_t aDataStart[1];
|
||||
} tSirWakeReasonInd, *tpSirWakeReasonInd;
|
||||
#endif /* WLAN_WAKEUP_EVENTS */
|
||||
|
||||
/*---------------------------------------------------------------------------
|
||||
sAniSetTmLevelReq
|
||||
---------------------------------------------------------------------------*/
|
||||
|
|
|
|||
|
|
@ -312,13 +312,9 @@ struct sir_mgmt_msg {
|
|||
|
||||
#define SIR_HAL_LOW_RSSI_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 80)
|
||||
#define SIR_HAL_BEACON_FILTER_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 81)
|
||||
/* / PE <-> HAL WOWL messages */
|
||||
#define SIR_HAL_WOW_ADD_PTRN (SIR_HAL_ITC_MSG_TYPES_BEGIN + 82)
|
||||
#define SIR_HAL_WOW_DEL_PTRN (SIR_HAL_ITC_MSG_TYPES_BEGIN + 83)
|
||||
#define SIR_HAL_WOWL_ENTER_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 84)
|
||||
#define SIR_HAL_WOWL_ENTER_RSP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 85)
|
||||
#define SIR_HAL_WOWL_EXIT_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 86)
|
||||
#define SIR_HAL_WOWL_EXIT_RSP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 87)
|
||||
|
||||
/* 82-87 are unused */
|
||||
|
||||
/* / PE <-> HAL statistics messages */
|
||||
#define SIR_HAL_GET_STATISTICS_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 88)
|
||||
#define SIR_HAL_GET_STATISTICS_RSP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 89)
|
||||
|
|
|
|||
|
|
@ -465,10 +465,6 @@ uint8_t *mac_trace_get_wma_msg_string(uint16_t wma_msg)
|
|||
CASE_RETURN_STRING(WMA_TRANSMISSION_CONTROL_IND);
|
||||
CASE_RETURN_STRING(WMA_ENABLE_UAPSD_REQ);
|
||||
CASE_RETURN_STRING(WMA_DISABLE_UAPSD_REQ);
|
||||
CASE_RETURN_STRING(WMA_WOW_ADD_PTRN);
|
||||
CASE_RETURN_STRING(WMA_WOW_DEL_PTRN);
|
||||
CASE_RETURN_STRING(WMA_WOWL_ENTER_REQ);
|
||||
CASE_RETURN_STRING(WMA_WOWL_EXIT_REQ);
|
||||
CASE_RETURN_STRING(WMA_GET_STATISTICS_REQ);
|
||||
CASE_RETURN_STRING(WMA_GET_STATISTICS_RSP);
|
||||
CASE_RETURN_STRING(WMA_SET_KEY_DONE);
|
||||
|
|
@ -592,8 +588,6 @@ uint8_t *mac_trace_get_wma_msg_string(uint16_t wma_msg)
|
|||
#ifdef WLAN_FEATURE_11W
|
||||
CASE_RETURN_STRING(WMA_EXCLUDE_UNENCRYPTED_IND);
|
||||
#endif
|
||||
CASE_RETURN_STRING(WMA_WOWL_ENTER_RSP);
|
||||
CASE_RETURN_STRING(WMA_WOWL_EXIT_RSP);
|
||||
CASE_RETURN_STRING(WMA_SET_MAX_TX_POWER_RSP);
|
||||
CASE_RETURN_STRING(WMA_SET_DTIM_PERIOD);
|
||||
CASE_RETURN_STRING(WMA_SET_MAX_TX_POWER_PER_BAND_REQ);
|
||||
|
|
|
|||
|
|
@ -483,22 +483,6 @@ static inline void sme_deregister_oem_data_rsp_callback(tHalHandle h_hal)
|
|||
|
||||
#endif
|
||||
|
||||
extern QDF_STATUS sme_enter_wowl(tHalHandle hHal,
|
||||
void (*enter_wowl_callback_routine)(void
|
||||
*callbackContext,
|
||||
QDF_STATUS status),
|
||||
void *enter_wowl_callback_context,
|
||||
#ifdef WLAN_WAKEUP_EVENTS
|
||||
void (*wake_reason_ind_cb)(void *callbackContext,
|
||||
tpSirWakeReasonInd
|
||||
wake_reason_ind),
|
||||
void *wake_reason_ind_cb_ctx,
|
||||
#endif /* WLAN_WAKEUP_EVENTS */
|
||||
tpSirSmeWowlEnterParams wowl_enter_params,
|
||||
uint8_t sessionId);
|
||||
|
||||
extern QDF_STATUS sme_exit_wowl(tHalHandle hHal,
|
||||
tpSirSmeWowlExitParams wowl_exit_params);
|
||||
QDF_STATUS sme_roam_set_key(tHalHandle, uint8_t sessionId,
|
||||
tCsrRoamSetKey *pSetKey, uint32_t *pRoamId);
|
||||
QDF_STATUS sme_get_country_code(tHalHandle hHal, uint8_t *pBuf, uint8_t *pbLen);
|
||||
|
|
|
|||
|
|
@ -63,17 +63,6 @@ ePhyChanBondState csr_convert_cb_ini_value_to_phy_cb_state(uint32_t cbIniValue);
|
|||
/* default sme timeout is set to 30 secs */
|
||||
#define SME_DEFAULT_CMD_TIMEOUT 30000
|
||||
|
||||
typedef struct sGenericPmcCmd {
|
||||
uint32_t size; /* sizeof the data in the union, if any */
|
||||
uint32_t sessionId;
|
||||
/* if true, the cmd shalln't put back to the queue, free mem instead. */
|
||||
bool fReleaseWhenDone;
|
||||
union {
|
||||
tSirSmeWowlEnterParams enterWowlInfo;
|
||||
tSirSmeWowlExitParams exitWowlInfo;
|
||||
} u;
|
||||
} tGenericPmcCmd;
|
||||
|
||||
typedef struct sGenericQosCmd {
|
||||
struct sme_qos_wmmtspecinfo tspecInfo;
|
||||
sme_QosEdcaAcType ac;
|
||||
|
|
@ -173,7 +162,6 @@ typedef struct tagSmeCmd {
|
|||
union {
|
||||
struct roam_cmd roamCmd;
|
||||
struct wmstatus_changecmd wmStatusChangeCmd;
|
||||
tGenericPmcCmd pmcCmd;
|
||||
tGenericQosCmd qosCmd;
|
||||
tRemainChlCmd remainChlCmd;
|
||||
struct addstafor_sessioncmd addStaSessionCmd;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2015-2017 The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2015-2018 The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
|
||||
*
|
||||
|
|
@ -72,17 +72,12 @@ enum ps_state {
|
|||
* setting which keep tracks of ACs being admitted.
|
||||
* If bit is set to 0: That particular AC is not admitted
|
||||
* If bit is set to 1: That particular AC is admitted
|
||||
* @ uapsd_per_ac_bit_mask: This is a static UAPSD mask setting
|
||||
* @uapsd_per_ac_bit_mask: This is a static UAPSD mask setting
|
||||
* derived from SME_JOIN_REQ and SME_REASSOC_REQ.
|
||||
* If a particular AC bit is set, it means the AC is both
|
||||
* trigger enabled and delivery enabled.
|
||||
* @enter_wowl_callback_routine: routine to call for wowl request.
|
||||
* @enter_wowl_callback_context: value to be passed as parameter to
|
||||
* routine specified above.
|
||||
* @wowl_enter_params: WOWL mode configuration.
|
||||
* @wake_reason_ind_cb: routine to call for wake reason indication.
|
||||
* @wake_reason_ind_cb_ctx: value to be passed as parameter to
|
||||
* routine specified above.
|
||||
* @auto_ps_enable_timer: Upon expiration of this timer Power Save Offload
|
||||
* module will try to enable sta mode ps
|
||||
*/
|
||||
|
||||
struct ps_params {
|
||||
|
|
@ -93,23 +88,6 @@ struct ps_params {
|
|||
uint8_t uapsd_per_ac_delivery_enable_mask;
|
||||
uint8_t ac_admit_mask[SIR_MAC_DIRECTION_DIRECT];
|
||||
uint8_t uapsd_per_ac_bit_mask;
|
||||
/* WOWL param */
|
||||
void (*enter_wowl_callback_routine)(void *callback_context,
|
||||
QDF_STATUS status);
|
||||
void *enter_wowl_callback_context;
|
||||
tSirSmeWowlEnterParams wowl_enter_params;
|
||||
#ifdef WLAN_WAKEUP_EVENTS
|
||||
void (*wake_reason_ind_cb)(void *callback_context,
|
||||
tpSirWakeReasonInd wake_reason_ind);
|
||||
void *wake_reason_ind_cb_ctx;
|
||||
#endif /* WLAN_WAKEUP_EVENTS */
|
||||
|
||||
/*
|
||||
* Auto Sta Ps Enable Timer
|
||||
* Upon expiration of this timer
|
||||
* Power Save Offload module will
|
||||
* try to enable sta mode ps
|
||||
*/
|
||||
qdf_mc_timer_t auto_ps_enable_timer;
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -958,10 +958,6 @@ int wma_d0_wow_disable_ack_event(void *handle, uint8_t *event, uint32_t len);
|
|||
|
||||
int wma_pdev_resume_event_handler(void *handle, uint8_t *event, uint32_t len);
|
||||
|
||||
QDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info);
|
||||
|
||||
QDF_STATUS wma_wow_exit(tp_wma_handle wma, tpSirHalWowlExitParams info);
|
||||
|
||||
void wma_del_ts_req(tp_wma_handle wma, tDelTsParams *msg);
|
||||
|
||||
void wma_aggr_qos_req(tp_wma_handle wma,
|
||||
|
|
|
|||
|
|
@ -219,13 +219,6 @@
|
|||
#define WMA_ENABLE_UAPSD_REQ SIR_HAL_ENABLE_UAPSD_REQ
|
||||
#define WMA_DISABLE_UAPSD_REQ SIR_HAL_DISABLE_UAPSD_REQ
|
||||
|
||||
/* / PE <-> HAL WOWL messages */
|
||||
#define WMA_WOW_ADD_PTRN SIR_HAL_WOW_ADD_PTRN
|
||||
#define WMA_WOW_DEL_PTRN SIR_HAL_WOW_DEL_PTRN
|
||||
#define WMA_WOWL_ENTER_REQ SIR_HAL_WOWL_ENTER_REQ
|
||||
#define WMA_WOWL_ENTER_RSP SIR_HAL_WOWL_ENTER_RSP
|
||||
#define WMA_WOWL_EXIT_REQ SIR_HAL_WOWL_EXIT_REQ
|
||||
#define WMA_WOWL_EXIT_RSP SIR_HAL_WOWL_EXIT_RSP
|
||||
/* / PE <-> HAL statistics messages */
|
||||
#define WMA_GET_STATISTICS_REQ SIR_HAL_GET_STATISTICS_REQ
|
||||
#define WMA_GET_STATISTICS_RSP SIR_HAL_GET_STATISTICS_RSP
|
||||
|
|
|
|||
|
|
@ -2882,33 +2882,6 @@ int wma_pdev_resume_event_handler(void *handle, uint8_t *event, uint32_t len)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* wma_wow_enter() - store enable/disable status for pattern
|
||||
* @wma: wma handle
|
||||
* @info: wow parameters
|
||||
*
|
||||
* Records pattern enable/disable status locally. This choice will
|
||||
* take effect when the driver enter into suspend state.
|
||||
*
|
||||
* Return: QDF status
|
||||
*/
|
||||
QDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info)
|
||||
{
|
||||
return QDF_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
* wma_wow_exit() - clear all wma states
|
||||
* @wma: wma handle
|
||||
* @info: wow params
|
||||
*
|
||||
* Return: QDF status
|
||||
*/
|
||||
QDF_STATUS wma_wow_exit(tp_wma_handle wma, tpSirHalWowlExitParams info)
|
||||
{
|
||||
return QDF_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
* wma_del_ts_req() - send DELTS request to fw
|
||||
* @wma: wma handle
|
||||
|
|
|
|||
|
|
@ -7762,14 +7762,6 @@ static QDF_STATUS wma_mc_process_msg(struct scheduler_msg *msg)
|
|||
wma_aggr_qos_req(wma_handle, (tAggrAddTsParams *) msg->bodyptr);
|
||||
break;
|
||||
|
||||
case WMA_WOWL_ENTER_REQ:
|
||||
wma_wow_enter(wma_handle,
|
||||
(tpSirHalWowlEnterParams) msg->bodyptr);
|
||||
break;
|
||||
case WMA_WOWL_EXIT_REQ:
|
||||
wma_wow_exit(wma_handle, (tpSirHalWowlExitParams) msg->bodyptr);
|
||||
break;
|
||||
|
||||
case WMA_8023_MULTICAST_LIST_REQ:
|
||||
wma_process_mcbc_set_filter_req(wma_handle,
|
||||
(tpSirRcvFltMcAddrList) msg->bodyptr);
|
||||
|
|
|
|||
Loading…
Reference in a new issue