qcacld-3.0: Remove FEATURE_WLAN_ESE_UPLOAD compile macro
At present and going forward ESE and ESE_UPLOAD will be the
de-facto approach supporting ESE. Hence there is no need of two compile macros
FEATURE_WLAN_ESE and FEATURE_WLAN_ESE_UPLOAD.
Instead Remove FEATURE_WLAN_ESE_UPLOAD and Keep only FEATURE_WLAN_ESE.
Change-Id: If1a04e95211a0d639db7b60a57a6d5f215d26f4e
CRs-Fixed: 950762
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 2bae37a..7859837 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -707,19 +707,6 @@
} tSirDFSChannelList, *tpSirDFSChannelList;
-#ifdef FEATURE_WLAN_ESE
-typedef struct sTspecInfo {
- uint8_t valid;
- tSirMacTspecIE tspec;
-} tTspecInfo;
-
-#define SIR_ESE_MAX_TSPEC_IES 4
-typedef struct sESETspecTspecInfo {
- uint8_t numTspecs;
- tTspecInfo tspec[SIR_ESE_MAX_TSPEC_IES];
-} tESETspecInfo;
-#endif
-
/* / Two Background Scan mode */
typedef enum eSirBackgroundScanMode {
eSIR_ROAMING_SCAN = 2,
@@ -886,6 +873,127 @@
#endif /* FEATURE_OEM_DATA_SUPPORT */
+#ifdef FEATURE_WLAN_ESE
+typedef struct sTspecInfo {
+ uint8_t valid;
+ tSirMacTspecIE tspec;
+} tTspecInfo;
+
+#define SIR_ESE_MAX_TSPEC_IES 4
+typedef struct sESETspecTspecInfo {
+ uint8_t numTspecs;
+ tTspecInfo tspec[SIR_ESE_MAX_TSPEC_IES];
+} tESETspecInfo;
+
+typedef struct sSirTsmIE {
+ uint8_t tsid;
+ uint8_t state;
+ uint16_t msmt_interval;
+} tSirTsmIE, *tpSirTsmIE;
+typedef struct sSirSmeTsmIEInd {
+ tSirTsmIE tsmIe;
+ uint8_t sessionId;
+} tSirSmeTsmIEInd, *tpSirSmeTsmIEInd;
+typedef struct sAniTrafStrmMetrics {
+ uint16_t UplinkPktQueueDly;
+ uint16_t UplinkPktQueueDlyHist[4];
+ uint32_t UplinkPktTxDly;
+ uint16_t UplinkPktLoss;
+ uint16_t UplinkPktCount;
+ uint8_t RoamingCount;
+ uint16_t RoamingDly;
+} tAniTrafStrmMetrics, *tpAniTrafStrmMetrics;
+
+typedef struct sAniGetTsmStatsReq {
+ /* Common for all types are requests */
+ uint16_t msgType; /* message type is same as the request type */
+ uint16_t msgLen; /* length of the entire request */
+ uint8_t staId;
+ uint8_t tid; /* traffic id */
+ struct qdf_mac_addr bssId;
+ void *tsmStatsCallback;
+ void *pDevContext; /* device context */
+ void *p_cds_context; /* cds context */
+} tAniGetTsmStatsReq, *tpAniGetTsmStatsReq;
+
+typedef struct sAniGetTsmStatsRsp {
+ /* Common for all types are responses */
+ uint16_t msgType; /*
+ * message type is same as
+ * the request type
+ */
+ uint16_t msgLen; /*
+ * length of the entire request,
+ * includes the pStatsBuf length too
+ */
+ uint8_t sessionId;
+ uint32_t rc; /* success/failure */
+ uint32_t staId; /*
+ * Per STA stats request must
+ * contain valid
+ */
+ tAniTrafStrmMetrics tsmMetrics;
+ void *tsmStatsReq; /* tsm stats request backup */
+} tAniGetTsmStatsRsp, *tpAniGetTsmStatsRsp;
+
+typedef struct sSirEseBcnReportBssInfo {
+ tBcnReportFields bcnReportFields;
+ uint8_t ieLen;
+ uint8_t *pBuf;
+} tSirEseBcnReportBssInfo, *tpSirEseBcnReportBssInfo;
+
+typedef struct sSirEseBcnReportRsp {
+ uint16_t measurementToken;
+ uint8_t flag; /* Flag to report measurement done and more data */
+ uint8_t numBss;
+ tSirEseBcnReportBssInfo bcnRepBssInfo[SIR_BCN_REPORT_MAX_BSS_DESC];
+} tSirEseBcnReportRsp, *tpSirEseBcnReportRsp;
+
+#define TSRS_11AG_RATE_6MBPS 0xC
+#define TSRS_11B_RATE_5_5MBPS 0xB
+typedef struct sSirMacESETSRSIE {
+ uint8_t tsid;
+ uint8_t rates[8];
+} tSirMacESETSRSIE;
+typedef struct sSirMacESETSMIE {
+ uint8_t tsid;
+ uint8_t state;
+ uint16_t msmt_interval;
+} tSirMacESETSMIE;
+typedef struct sTSMStats {
+ uint8_t tid;
+ struct qdf_mac_addr bssid;
+ tTrafStrmMetrics tsmMetrics;
+} tTSMStats, *tpTSMStats;
+typedef struct sEseTSMContext {
+ uint8_t tid;
+ tSirMacESETSMIE tsmInfo;
+ tTrafStrmMetrics tsmMetrics;
+} tEseTSMContext, *tpEseTSMContext;
+typedef struct sEsePEContext {
+ tEseTSMContext tsm;
+} tEsePEContext, *tpEsePEContext;
+
+typedef struct sSirPlmReq {
+ uint16_t diag_token; /* Dialog token */
+ uint16_t meas_token; /* measurement token */
+ uint16_t numBursts; /* total number of bursts */
+ uint16_t burstInt; /* burst interval in seconds */
+ uint16_t measDuration; /* in TU's,STA goes off-ch */
+ /* no of times the STA should cycle through PLM ch list */
+ uint8_t burstLen;
+ int8_t desiredTxPwr; /* desired tx power */
+ struct qdf_mac_addr mac_addr; /* MC dest addr */
+ /* no of channels */
+ uint8_t plmNumCh;
+ /* channel numbers */
+ uint8_t plmChList[WNI_CFG_VALID_CHANNEL_LIST_LEN];
+ uint8_t sessionId;
+ bool enable;
+} tSirPlmReq, *tpSirPlmReq;
+
+#endif /* FEATURE_WLAN_ESE */
+
/* / Definition for response message to previously issued scan request */
typedef struct sSirSmeScanRsp {
uint16_t messageType; /* eWNI_SME_SCAN_RSP */
@@ -1644,73 +1752,6 @@
int8_t snr;
} tAniGetSnrReq, *tpAniGetSnrReq;
-#if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_ESE_UPLOAD)
-typedef struct sSirTsmIE {
- uint8_t tsid;
- uint8_t state;
- uint16_t msmt_interval;
-} tSirTsmIE, *tpSirTsmIE;
-typedef struct sSirSmeTsmIEInd {
- tSirTsmIE tsmIe;
- uint8_t sessionId;
-} tSirSmeTsmIEInd, *tpSirSmeTsmIEInd;
-typedef struct sAniTrafStrmMetrics {
- uint16_t UplinkPktQueueDly;
- uint16_t UplinkPktQueueDlyHist[4];
- uint32_t UplinkPktTxDly;
- uint16_t UplinkPktLoss;
- uint16_t UplinkPktCount;
- uint8_t RoamingCount;
- uint16_t RoamingDly;
-} tAniTrafStrmMetrics, *tpAniTrafStrmMetrics;
-
-typedef struct sAniGetTsmStatsReq {
- /* Common for all types are requests */
- uint16_t msgType; /* message type is same as the request type */
- uint16_t msgLen; /* length of the entire request */
- uint8_t staId;
- uint8_t tid; /* traffic id */
- struct qdf_mac_addr bssId;
- void *tsmStatsCallback;
- void *pDevContext; /* device context */
- void *p_cds_context; /* cds context */
-} tAniGetTsmStatsReq, *tpAniGetTsmStatsReq;
-
-typedef struct sAniGetTsmStatsRsp {
- /* Common for all types are responses */
- uint16_t msgType; /*
- * message type is same as
- * the request type
- */
- uint16_t msgLen; /*
- * length of the entire request,
- * includes the pStatsBuf length too
- */
- uint8_t sessionId;
- uint32_t rc; /* success/failure */
- uint32_t staId; /*
- * Per STA stats request must
- * contain valid
- */
- tAniTrafStrmMetrics tsmMetrics;
- void *tsmStatsReq; /* tsm stats request backup */
-} tAniGetTsmStatsRsp, *tpAniGetTsmStatsRsp;
-
-typedef struct sSirEseBcnReportBssInfo {
- tBcnReportFields bcnReportFields;
- uint8_t ieLen;
- uint8_t *pBuf;
-} tSirEseBcnReportBssInfo, *tpSirEseBcnReportBssInfo;
-
-typedef struct sSirEseBcnReportRsp {
- uint16_t measurementToken;
- uint8_t flag; /* Flag to report measurement done and more data */
- uint8_t numBss;
- tSirEseBcnReportBssInfo bcnRepBssInfo[SIR_BCN_REPORT_MAX_BSS_DESC];
-} tSirEseBcnReportRsp, *tpSirEseBcnReportRsp;
-
-#endif /* FEATURE_WLAN_ESE || FEATURE_WLAN_ESE_UPLOAD */
-
/* Change country code request MSG structure */
typedef struct sAniChangeCountryCodeReq {
/* Common for all types are requests */
@@ -1877,33 +1918,6 @@
} qdf_packed tclasParams;
} qdf_packed tSirTclasInfo;
-#if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_ESE_UPLOAD)
-#define TSRS_11AG_RATE_6MBPS 0xC
-#define TSRS_11B_RATE_5_5MBPS 0xB
-typedef struct sSirMacESETSRSIE {
- uint8_t tsid;
- uint8_t rates[8];
-} tSirMacESETSRSIE;
-typedef struct sSirMacESETSMIE {
- uint8_t tsid;
- uint8_t state;
- uint16_t msmt_interval;
-} tSirMacESETSMIE;
-typedef struct sTSMStats {
- uint8_t tid;
- struct qdf_mac_addr bssid;
- tTrafStrmMetrics tsmMetrics;
-} tTSMStats, *tpTSMStats;
-typedef struct sEseTSMContext {
- uint8_t tid;
- tSirMacESETSMIE tsmInfo;
- tTrafStrmMetrics tsmMetrics;
-} tEseTSMContext, *tpEseTSMContext;
-typedef struct sEsePEContext {
- tEseTSMContext tsm;
-} tEsePEContext, *tpEsePEContext;
-#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
-
typedef struct sSirAddtsReqInfo {
uint8_t dialogToken;
tSirMacTspecIE tspec;
@@ -1931,7 +1945,7 @@
tSirTclasInfo tclasInfo[SIR_MAC_TCLASIE_MAXNUM];
uint8_t tclasProc;
tSirMacScheduleIE schedule;
-#if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_ESE_UPLOAD)
+#ifdef FEATURE_WLAN_ESE
tSirMacESETSMIE tsmIE;
uint8_t tsmPresent:1;
#endif
@@ -1994,27 +2008,6 @@
tSirDeltsReqInfo rsp;
} tSirDeltsRsp, *tpSirDeltsRsp;
-#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
-typedef struct sSirPlmReq {
- uint16_t diag_token; /* Dialog token */
- uint16_t meas_token; /* measurement token */
- uint16_t numBursts; /* total number of bursts */
- uint16_t burstInt; /* burst interval in seconds */
- uint16_t measDuration; /* in TU's,STA goes off-ch */
- /* no of times the STA should cycle through PLM ch list */
- uint8_t burstLen;
- int8_t desiredTxPwr; /* desired tx power */
- struct qdf_mac_addr mac_addr; /* MC dest addr */
- /* no of channels */
- uint8_t plmNumCh;
- /* channel numbers */
- uint8_t plmChList[WNI_CFG_VALID_CHANNEL_LIST_LEN];
- uint8_t sessionId;
- bool enable;
-} tSirPlmReq, *tpSirPlmReq;
-#endif
-
-
#define SIR_QOS_NUM_AC_MAX 4
typedef struct sSirAggrQosReqInfo {
diff --git a/core/mac/src/include/parser_api.h b/core/mac/src/include/parser_api.h
index 256967d..f48aac5 100644
--- a/core/mac/src/include/parser_api.h
+++ b/core/mac/src/include/parser_api.h
@@ -280,7 +280,7 @@
tDot11fIEOBSSScanParameters obss_scanparams;
} tSirAssocRsp, *tpSirAssocRsp;
-#if defined(FEATURE_WLAN_ESE_UPLOAD)
+#ifdef FEATURE_WLAN_ESE
/* Structure to hold ESE Beacon report mandatory IEs */
typedef struct sSirEseBcnReportMandatoryIe {
tSirMacSSid ssId;
@@ -301,7 +301,7 @@
uint8_t timPresent;
uint8_t rrmPresent;
} tSirEseBcnReportMandatoryIe, *tpSirEseBcnReportMandatoryIe;
-#endif /* FEATURE_WLAN_ESE_UPLOAD */
+#endif /* FEATURE_WLAN_ESE */
/**
* struct s_ext_cap - holds bitfields of extended capability IE
@@ -457,13 +457,6 @@
tpSirProbeRespBeacon pBeaconStruct,
uint8_t *pPayload, uint32_t payloadLength);
-#if defined(FEATURE_WLAN_ESE_UPLOAD)
-tSirRetStatus
-sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac,
- uint8_t *pPayload, const uint32_t payloadLength,
- uint8_t **outIeBuf, uint32_t *pOutIeLen);
-#endif /* FEATURE_WLAN_ESE_UPLOAD */
-
tSirRetStatus
sir_convert_beacon_frame2_struct(struct sAniSirGlobal *pMac,
uint8_t *pBeaconFrame,
@@ -786,6 +779,11 @@
void populate_dot11f_re_assoc_tspec(tpAniSirGlobal pMac,
tDot11fReAssocRequest *pReassoc,
tpPESession psessionEntry);
+tSirRetStatus
+sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac,
+ uint8_t *pPayload, const uint32_t payloadLength,
+ uint8_t **outIeBuf, uint32_t *pOutIeLen);
+
#endif
void populate_dot11f_wmm_info_ap(tpAniSirGlobal pMac,
diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h
index d8b6418..c9d78dd 100644
--- a/core/mac/src/include/sir_params.h
+++ b/core/mac/src/include/sir_params.h
@@ -479,7 +479,7 @@
#define SIR_HAL_INIT_THERMAL_INFO_CMD (SIR_HAL_ITC_MSG_TYPES_BEGIN + 185)
#define SIR_HAL_SET_THERMAL_LEVEL (SIR_HAL_ITC_MSG_TYPES_BEGIN + 186)
-#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
+#ifdef FEATURE_WLAN_ESE
#define SIR_HAL_SET_PLM_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 187)
#endif
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index 0dc7d79..72331a3 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -623,8 +623,6 @@
lim_deactivate_and_change_timer(pMac, eLIM_JOIN_FAIL_TIMER);
pMac->lim.gLastBeaconDtimCount = 0;
pMac->lim.gLastBeaconDtimPeriod = 0;
-
-
}
#ifdef WLAN_DEBUG
/* increment a debug count */
@@ -4992,7 +4990,7 @@
}
#endif
-#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
+#ifdef FEATURE_WLAN_ESE
/** -------------------------------------------------------------
\fn lim_send_sme_tsm_ie_ind
\brief Forwards the TSM IE information to SME.
@@ -5032,4 +5030,4 @@
lim_sys_process_mmh_msg_api(pMac, &mmhMsg, ePROT);
return;
}
-#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
+#endif /* FEATURE_WLAN_ESE */
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.h b/core/mac/src/pe/lim/lim_assoc_utils.h
index 9daef51..0331e5a 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.h
+++ b/core/mac/src/pe/lim/lim_assoc_utils.h
@@ -166,7 +166,7 @@
tpPESession psessionEntry);
#endif
-#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
+#ifdef FEATURE_WLAN_ESE
void lim_send_sme_tsm_ie_ind(tpAniSirGlobal pMac, tpPESession psessionEntry,
uint8_t tid, uint8_t state, uint16_t measInterval);
#else
@@ -174,6 +174,6 @@
tpPESession psessionEntry, uint8_t tid,
uint8_t state, uint16_t measInterval)
{}
-#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
+#endif /* FEATURE_WLAN_ESE */
#endif /* __LIM_ASSOC_UTILS_H */
diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c
index 81e0762..bc4ccaf 100644
--- a/core/mac/src/pe/lim/lim_process_action_frame.c
+++ b/core/mac/src/pe/lim/lim_process_action_frame.c
@@ -813,11 +813,9 @@
addts.tspec.tsinfo.traffic.userPrio;
qdf_mem_copy(&session->eseContext.tsm.tsmInfo,
&addts.tsmIE, sizeof(tSirMacESETSMIE));
-#ifdef FEATURE_WLAN_ESE_UPLOAD
lim_send_sme_tsm_ie_ind(mac_ctx, session, addts.tsmIE.tsid,
addts.tsmIE.state,
addts.tsmIE.msmt_interval);
-#endif /* FEATURE_WLAN_ESE_UPLOAD */
}
#endif
/*
@@ -1090,9 +1088,7 @@
lim_log(mac_ctx, LOG1, FL("DeleteTS succeeded"));
#ifdef FEATURE_WLAN_ESE
-#ifdef FEATURE_WLAN_ESE_UPLOAD
lim_send_sme_tsm_ie_ind(mac_ctx, session, 0, 0, 0);
-#endif /* FEATURE_WLAN_ESE_UPLOAD */
#endif
}
diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
index adeee6a..3fa8cf4 100644
--- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
+++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
@@ -484,12 +484,10 @@
assoc_rsp->TSPECInfo[cnt].user_priority;
qdf_mem_copy(&tsm_ctx->tsmInfo,
&assoc_rsp->tsmIE, sizeof(tSirMacESETSMIE));
-#ifdef FEATURE_WLAN_ESE_UPLOAD
lim_send_sme_tsm_ie_ind(mac_ctx,
session_entry, assoc_rsp->tsmIE.tsid,
assoc_rsp->tsmIE.state,
assoc_rsp->tsmIE.msmt_interval);
-#endif
if (tsm_ctx->tsmInfo.state)
tsm_ctx->tsmMetrics.RoamingCount++;
break;
diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c
index e4b1649..b239c85 100644
--- a/core/mac/src/pe/lim/lim_process_message_queue.c
+++ b/core/mac/src/pe/lim/lim_process_message_queue.c
@@ -1590,9 +1590,9 @@
case eWNI_SME_UPDATE_NOA:
case eWNI_SME_CLEAR_DFS_CHANNEL_LIST:
case eWNI_SME_GET_STATISTICS_REQ:
-#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
+#ifdef FEATURE_WLAN_ESE
case eWNI_SME_GET_TSM_STATS_REQ:
-#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
+#endif /* FEATURE_WLAN_ESE */
case eWNI_SME_REGISTER_MGMT_FRAME_CB:
case eWNI_SME_EXT_CHANGE_CHANNEL:
/* These messages are from HDD.No need to respond to HDD */
@@ -1734,10 +1734,8 @@
break;
#ifdef FEATURE_WLAN_ESE
case WMA_TSM_STATS_RSP:
-#ifdef FEATURE_WLAN_ESE_UPLOAD
lim_send_sme_pe_ese_tsm_rsp(mac_ctx,
(tAniGetTsmStatsRsp *) msg->bodyptr);
-#endif /* FEATURE_WLAN_ESE_UPLOAD */
break;
#endif
case WMA_ADD_TS_RSP:
diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
index 3c60579..3bbbf64 100644
--- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
@@ -3962,9 +3962,7 @@
status = eSIR_FAILURE;
}
#ifdef FEATURE_WLAN_ESE
-#ifdef FEATURE_WLAN_ESE_UPLOAD
lim_send_sme_tsm_ie_ind(pMac, psessionEntry, 0, 0, 0);
-#endif /* FEATURE_WLAN_ESE_UPLOAD */
#endif
/* send an sme response back */
@@ -4052,15 +4050,14 @@
return;
}
-#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
+#ifdef FEATURE_WLAN_ESE
/**
- *FUNCTION: __lim_process_sme_get_tsm_stats_request()
+ * __lim_process_sme_get_tsm_stats_request() - get tsm stats request
*
- ***NOTE:
+ * @pMac: Pointer to Global MAC structure
+ * @pMsgBuf: A pointer to the SME message buffer
*
- * @param pMac Pointer to Global MAC structure
- * @param *pMsgBuf A pointer to the SME message buffer
- * @return None
+ * Return: None
*/
static void
__lim_process_sme_get_tsm_stats_request(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
@@ -4080,7 +4077,7 @@
return;
}
}
-#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
+#endif /* FEATURE_WLAN_ESE */
static void
__lim_process_sme_update_apwpsi_es(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
@@ -4880,12 +4877,12 @@
/* HAL consumes pMsgBuf. It will be freed there. Set bufConsumed to false. */
bufConsumed = false;
break;
-#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
+#ifdef FEATURE_WLAN_ESE
case eWNI_SME_GET_TSM_STATS_REQ:
__lim_process_sme_get_tsm_stats_request(pMac, pMsgBuf);
bufConsumed = false;
break;
-#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
+#endif /* FEATURE_WLAN_ESE */
case eWNI_SME_GET_ASSOC_STAS_REQ:
lim_process_sme_get_assoc_sta_info(pMac, pMsgBuf);
break;
diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
index c6565a5..54eb1f0 100644
--- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
@@ -1907,23 +1907,20 @@
} /*** end lim_send_sme_pe_statistics_rsp() ***/
-#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
+#ifdef FEATURE_WLAN_ESE
/**
- * lim_send_sme_pe_ese_tsm_rsp()
+ * lim_send_sme_pe_ese_tsm_rsp() - send tsm response
+ * @pMac: Pointer to global pMac structure
+ * @pStats: Pointer to TSM Stats
*
- ***FUNCTION:
* This function is called to send tsm stats response to HDD.
* This function posts the result back to HDD. This is a response to
* HDD's request to get tsm stats.
*
- ***PARAMS:
- * @param pMac - Pointer to global pMac structure
- * @param pStats - Pointer to TSM Stats
- *
- * @return none
+ * Return: None
*/
-
-void lim_send_sme_pe_ese_tsm_rsp(tpAniSirGlobal pMac, tAniGetTsmStatsRsp *pStats)
+void lim_send_sme_pe_ese_tsm_rsp(tpAniSirGlobal pMac,
+ tAniGetTsmStatsRsp *pStats)
{
tSirMsgQ mmhMsg;
uint8_t sessionId;
@@ -1940,9 +1937,8 @@
pPeStats->sessionId = pPeSessionEntry->smeSessionId;
} else {
PELOGE(lim_log
- (pMac, LOGE, FL("Session not found for the Sta id(%d)"),
- pPeStats->staId);
- )
+ (pMac, LOGE, FL("Session not found for the Sta id(%d)"),
+ pPeStats->staId);)
return;
}
@@ -1961,7 +1957,7 @@
return;
} /*** end lim_send_sme_pe_ese_tsm_rsp() ***/
-#endif /* FEATURE_WLAN_ESE) && FEATURE_WLAN_ESE_UPLOAD */
+#endif /* FEATURE_WLAN_ESE */
void
lim_send_sme_ibss_peer_ind(tpAniSirGlobal pMac,
diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h
index 4e94f42..f8997d1 100644
--- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h
+++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h
@@ -89,7 +89,7 @@
void lim_send_sme_pe_statistics_rsp(tpAniSirGlobal pMac, uint16_t msgtype,
void *stats);
-#ifdef FEATURE_WLAN_ESE_UPLOAD
+#ifdef FEATURE_WLAN_ESE
void lim_send_sme_pe_ese_tsm_rsp(tpAniSirGlobal pMac, tAniGetTsmStatsRsp *pStats);
#endif
diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c
index 1f34968..65a231f 100644
--- a/core/mac/src/pe/lim/lim_utils.c
+++ b/core/mac/src/pe/lim/lim_utils.c
@@ -422,12 +422,12 @@
return "eWNI_PMC_EXIT_BMPS_IND";
case eWNI_SME_SET_BCN_FILTER_REQ:
return "eWNI_SME_SET_BCN_FILTER_REQ";
-#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
+#ifdef FEATURE_WLAN_ESE
case eWNI_SME_GET_TSM_STATS_REQ:
return "eWNI_SME_GET_TSM_STATS_REQ";
case eWNI_SME_GET_TSM_STATS_RSP:
return "eWNI_SME_GET_TSM_STATS_RSP";
-#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
+#endif /* FEATURE_WLAN_ESE */
case eWNI_SME_CSA_OFFLOAD_EVENT:
return "eWNI_SME_CSA_OFFLOAD_EVENT";
case eWNI_SME_SET_HW_MODE_REQ:
diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c
index e9adfc8..75b4b5a 100644
--- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c
+++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c
@@ -467,7 +467,7 @@
#ifndef REMOVE_PKT_LOG
CASE_RETURN_STRING(WMA_PKTLOG_ENABLE_REQ);
#endif
-#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
+#ifdef FEATURE_WLAN_ESE
CASE_RETURN_STRING(WMA_SET_PLM_REQ);
#endif
CASE_RETURN_STRING(WMA_CONFIG_PARAM_UPDATE_REQ);
diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c
index b41e616..e94a5f6 100644
--- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c
+++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c
@@ -3110,7 +3110,7 @@
} /* End sir_convert_reassoc_req_frame2_struct. */
-#if defined(FEATURE_WLAN_ESE_UPLOAD)
+#ifdef FEATURE_WLAN_ESE
tSirRetStatus
sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac,
uint8_t *pPayload, const uint32_t nPayload,
@@ -3409,7 +3409,7 @@
return retStatus;
}
-#endif /* FEATURE_WLAN_ESE_UPLOAD */
+#endif /* FEATURE_WLAN_ESE */
tSirRetStatus
sir_parse_beacon_ie(tpAniSirGlobal pMac,