wlan: Enterprise Security Enhancements
A proper nomenclature is being put in place, to make
the code reflect the appropriate functionality
that is associated with it.
Change-Id: I3e0c869a1259b77c4e692fe02f93cbcef9001104
CRs-Fixed: 622164
(cherry picked from commit 39aef9ead739f8574c2e88a2465f81e2091174a3)
diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c
index e53cf85..6af055e 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -346,7 +346,7 @@
WDI_ProcessShutdownReq, /* WDI_SHUTDOWN_REQ */
WDI_ProcessSetPowerParamsReq, /*WDI_SET_POWER_PARAMS_REQ*/
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
WDI_ProcessTSMStatsReq, /* WDI_TSM_STATS_REQ */
#else
NULL,
@@ -367,7 +367,7 @@
#else
NULL,
#endif
-#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
WDI_ProcessGetRoamRssiReq, /* WDI_GET_ROAM_RSSI_REQ */
#else
NULL,
@@ -565,7 +565,7 @@
WDI_ProcessShutdownRsp, /* WDI_SHUTDOWN_RESP */
WDI_ProcessSetPowerParamsRsp, /*WDI_SET_POWER_PARAMS_RESP*/
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
WDI_ProcessTsmStatsRsp, /* WDI_TSM_STATS_RESP */
#else
NULL,
@@ -585,7 +585,7 @@
#else
NULL,
#endif
-#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
WDI_ProcessGetRoamRssiRsp, /* WDI_GET_ROAM_RSSI_RESP */
#else
NULL,
@@ -3059,7 +3059,7 @@
return WDI_PostMainEvent(&gWDICb, WDI_REQUEST_EVENT, &wdiEventData);
}
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
WDI_Status
WDI_TSMStatsReq
(
@@ -5074,7 +5074,7 @@
}/*WDI_GetStatsReq*/
-#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
/**
@brief WDI_GetRoamRssiReq will be called when the upper MAC wants
to get roam rssi from the device. Upon
@@ -10290,7 +10290,7 @@
wdiDelBARspCb, pEventData->pUserData, WDI_DEL_BA_RESP);
}/*WDI_ProcessDelBAReq*/
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
WDI_Status
WDI_ProcessTSMStatsReq
@@ -11835,7 +11835,7 @@
wdiGetStatsRspCb, pEventData->pUserData, WDI_GET_STATS_RESP);
}/*WDI_ProcessGetStatsReq*/
-#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
/**
@brief Process Get Roam Rssi Request function (called when Main FSM
allows it)
@@ -13408,7 +13408,7 @@
enterBmpsReq.dtimCount = pwdiEnterBmpsReqParams->wdiEnterBmpsInfo.ucDtimCount;
enterBmpsReq.dtimPeriod = pwdiEnterBmpsReqParams->wdiEnterBmpsInfo.ucDtimPeriod;
- // For CCX and 11R Roaming
+ // For ESE and 11R Roaming
enterBmpsReq.rssiFilterPeriod = pwdiEnterBmpsReqParams->wdiEnterBmpsInfo.rssiFilterPeriod;
enterBmpsReq.numBeaconPerRssiAverage = pwdiEnterBmpsReqParams->wdiEnterBmpsInfo.numBeaconPerRssiAverage;
enterBmpsReq.bRssiFilterEnable = pwdiEnterBmpsReqParams->wdiEnterBmpsInfo.bRssiFilterEnable;
@@ -17013,7 +17013,7 @@
return WDI_STATUS_SUCCESS;
}/*WDI_ProcessDelBARsp*/
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
/**
@brief Process TSM Stats Rsp function (called when a response
is being received over the bus from HAL)
@@ -17832,7 +17832,7 @@
return WDI_STATUS_SUCCESS;
}/*WDI_ProcessGetStatsRsp*/
-#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
/**
@brief Process Get Roam Rssi Rsp function (called when a response is
being received over the bus from HAL)
@@ -22851,7 +22851,7 @@
return WLAN_HAL_ADD_BA_REQ;
case WDI_DEL_BA_REQ:
return WLAN_HAL_DEL_BA_REQ;
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
case WDI_TSM_STATS_REQ:
return WLAN_HAL_TSM_STATS_REQ;
#endif
@@ -23091,7 +23091,7 @@
return WDI_ADD_BA_RESP;
case WLAN_HAL_DEL_BA_RSP:
return WDI_DEL_BA_RESP;
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
case WLAN_HAL_TSM_STATS_RSP:
return WDI_TSM_STATS_RESP;
#endif
@@ -23261,7 +23261,7 @@
case WLAN_HAL_UPDATE_VHT_OP_MODE_RSP:
return WDI_UPDATE_VHT_OP_MODE_RESP;
#endif
-#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
case WLAN_HAL_GET_ROAM_RSSI_RSP:
return WDI_GET_ROAM_RSSI_RESP;
#endif
@@ -24123,7 +24123,7 @@
*ppfnReqCB = ((WDI_DelBAReqParamsType*)pEvent->pEventData)->wdiReqStatusCB;
*ppUserData = ((WDI_DelBAReqParamsType*)pEvent->pEventData)->pUserData;
break;
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
case WDI_TSM_STATS_REQ:
*ppfnReqCB = ((WDI_TSMStatsReqParamsType*)pEvent->pEventData)->wdiReqStatusCB;
*ppUserData = ((WDI_TSMStatsReqParamsType*)pEvent->pEventData)->pUserData;
@@ -24145,7 +24145,7 @@
*ppfnReqCB = ((WDI_GetStatsReqParamsType*)pEvent->pEventData)->wdiReqStatusCB;
*ppUserData = ((WDI_GetStatsReqParamsType*)pEvent->pEventData)->pUserData;
break;
-#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
case WDI_GET_ROAM_RSSI_REQ:
*ppfnReqCB = ((WDI_GetRoamRssiReqParamsType*)pEvent->pEventData)->wdiReqStatusCB;
*ppUserData = ((WDI_GetRoamRssiReqParamsType*)pEvent->pEventData)->pUserData;
@@ -25118,7 +25118,7 @@
pRoamCandidateListParams->NeighborScanChannelMinTime = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.NeighborScanChannelMinTime ;
pRoamCandidateListParams->NeighborScanChannelMaxTime = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.NeighborScanChannelMaxTime ;
pRoamCandidateListParams->EmptyRefreshScanPeriod = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.EmptyRefreshScanPeriod ;
- pRoamCandidateListParams->IsCCXEnabled = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.IsCCXEnabled ;
+ pRoamCandidateListParams->IsESEEnabled = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.IsESEEnabled ;
wpalMemoryCopy(pRoamCandidateListParams->ValidChannelList,
pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.ValidChannelList,
pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.ValidChannelCount);