mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-15 09:14:18 -04:00
qcacld-3.0: Remove #ifdef FEATURE_WLAN_LFR from SME
The condition #ifdef WLAN_FEATURE_LFR is used to include some of the roaming code. It has been defined for all the recent driver builds. Roaming code underneath is permanent part of the driver. Remove #ifdef FEATURE_WLAN_LFR compiler flag from SME so that the code will always be compiled in. CRs-Fixed: 936683 Change-Id: I86b9e3dee6b92c89a54de6df769800c31fc3ad17
This commit is contained in:
Deepak Dhamdhere
Akash Patel
parent
b45399a48b
commit
efcc4aa288
12 changed files with 15 additions and 167 deletions
|
|
@ -486,9 +486,7 @@ typedef enum {
|
|||
/* this mean error happens before assoc_start/roam_start is called. */
|
||||
eCSR_ROAM_SESSION_OPENED,
|
||||
eCSR_ROAM_FT_REASSOC_FAILED,
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
eCSR_ROAM_PMK_NOTIFY,
|
||||
#endif
|
||||
/*
|
||||
* Following 4 enums are used by FEATURE_WLAN_LFR_METRICS
|
||||
* but they are needed for compilation even when
|
||||
|
|
@ -1146,16 +1144,11 @@ typedef struct tagCsrConfigParam {
|
|||
#ifdef FEATURE_WLAN_ESE
|
||||
uint8_t isEseIniFeatureEnabled;
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
uint8_t isFastRoamIniFeatureEnabled;
|
||||
uint8_t MAWCEnabled;
|
||||
#endif
|
||||
#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || \
|
||||
defined(FEATURE_WLAN_LFR)
|
||||
uint8_t isFastTransitionEnabled;
|
||||
uint8_t RoamRssiDiff;
|
||||
bool isWESModeEnabled;
|
||||
#endif
|
||||
tCsrNeighborRoamConfigParams neighborRoamConfig;
|
||||
/*
|
||||
* Instead of Reassoc, send ADDTS/DELTS even when ACM is off for that AC
|
||||
|
|
@ -1204,8 +1197,6 @@ typedef struct tagCsrConfigParam {
|
|||
* To enable/disable scanning only 2.4Ghz channels on first scan
|
||||
*/
|
||||
bool fFirstScanOnly2GChnl;
|
||||
#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || \
|
||||
defined(FEATURE_WLAN_LFR)
|
||||
bool nRoamPrefer5GHz;
|
||||
bool nRoamIntraBand;
|
||||
uint8_t nProbes;
|
||||
|
|
@ -1213,7 +1204,6 @@ typedef struct tagCsrConfigParam {
|
|||
|
||||
bool isRoamOffloadScanEnabled;
|
||||
bool bFastRoamInConIniFeatureEnabled;
|
||||
#endif
|
||||
uint8_t scanCfgAgingTime;
|
||||
uint8_t enableTxLdpc;
|
||||
uint8_t isAmsduSupportInAMPDU;
|
||||
|
|
|
|||
|
|
@ -77,8 +77,6 @@
|
|||
(((pMac)->roam.configParam.roam_params.is_5g_pref_enabled) ? \
|
||||
true : false) \
|
||||
)
|
||||
#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || \
|
||||
defined(FEATURE_WLAN_LFR)
|
||||
#define CSR_IS_ROAM_PREFER_5GHZ(pMac) \
|
||||
( \
|
||||
(((pMac)->roam.configParam.nRoamPrefer5GHz) ? true : false) \
|
||||
|
|
@ -87,7 +85,6 @@
|
|||
( \
|
||||
(((pMac)->roam.configParam.nRoamIntraBand) ? true : false) \
|
||||
)
|
||||
#endif
|
||||
#define CSR_IS_FASTROAM_IN_CONCURRENCY_INI_FEATURE_ENABLED(pMac) \
|
||||
( \
|
||||
(((pMac)->roam.configParam.bFastRoamInConIniFeatureEnabled) ? \
|
||||
|
|
@ -566,17 +563,13 @@ typedef struct tagCsrConfig {
|
|||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
tCsr11rConfig csr11rConfig;
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
uint8_t isFastRoamIniFeatureEnabled;
|
||||
uint8_t MAWCEnabled;
|
||||
uint8_t isRoamOffloadScanEnabled;
|
||||
bool bFastRoamInConIniFeatureEnabled;
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
uint8_t isEseIniFeatureEnabled;
|
||||
#endif
|
||||
#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) \
|
||||
|| defined(FEATURE_WLAN_LFR)
|
||||
uint8_t isFastTransitionEnabled;
|
||||
uint8_t RoamRssiDiff;
|
||||
bool nRoamPrefer5GHz;
|
||||
|
|
@ -585,7 +578,6 @@ typedef struct tagCsrConfig {
|
|||
bool nRoamScanControl;
|
||||
uint8_t nProbes;
|
||||
uint16_t nRoamScanHomeAwayTime;
|
||||
#endif
|
||||
|
||||
tCsrNeighborRoamConfig neighborRoamConfig;
|
||||
|
||||
|
|
@ -1017,17 +1009,12 @@ typedef struct tagCsrRoamStruct {
|
|||
tCsrRoamSession *roamSession;
|
||||
uint32_t transactionId; /* Current transaction ID for internal use. */
|
||||
tCsrNeighborRoamControlInfo neighborRoamInfo[CSR_ROAM_SESSION_MAX];
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
uint8_t isFastRoamIniFeatureEnabled;
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
uint8_t isEseIniFeatureEnabled;
|
||||
#endif
|
||||
#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) \
|
||||
|| defined(FEATURE_WLAN_LFR)
|
||||
uint8_t RoamRssiDiff;
|
||||
bool isWESModeEnabled;
|
||||
#endif
|
||||
uint32_t deauthRspStatus;
|
||||
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
|
||||
uint8_t *pReassocResp; /* reassociation response from new AP */
|
||||
|
|
@ -1326,7 +1313,6 @@ bool csr_neighbor_roam_is_ese_assoc(tpAniSirGlobal pMac, uint8_t sessionId);
|
|||
/* Remove this code once SLM_Sessionization is supported */
|
||||
void csr_disconnect_all_active_sessions(tpAniSirGlobal pMac);
|
||||
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
/* Returns whether "Legacy Fast Roaming" is enabled...or not */
|
||||
bool csr_roam_is_fast_roam_enabled(tpAniSirGlobal pMac, uint32_t sessionId);
|
||||
bool csr_roam_is_roam_offload_scan_enabled(tpAniSirGlobal pMac);
|
||||
|
|
@ -1339,7 +1325,6 @@ CDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac,
|
|||
CDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, uint8_t sessionId,
|
||||
tCsrHandoffRequest *pHandoffInfo);
|
||||
bool csr_roam_is_sta_mode(tpAniSirGlobal pMac, uint32_t sessionId);
|
||||
#endif
|
||||
|
||||
/* Post Channel Change Indication */
|
||||
CDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac,
|
||||
|
|
|
|||
|
|
@ -126,7 +126,6 @@ typedef struct sCsr11rAssocNeighborInfo {
|
|||
} tCsr11rAssocNeighborInfo, *tpCsr11rAssocNeighborInfo;
|
||||
#endif /* WLAN_FEATURE_VOWIFI_11R */
|
||||
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
typedef enum {
|
||||
eFirstEmptyScan = 1,
|
||||
eSecondEmptyScan,
|
||||
|
|
@ -140,7 +139,6 @@ typedef enum {
|
|||
DEFAULT_SCAN = 0,
|
||||
SPLIT_SCAN_OCCUPIED_LIST = 1,
|
||||
} eNeighborRoamScanMode;
|
||||
#endif
|
||||
|
||||
/* Complete control information for neighbor roam algorithm */
|
||||
typedef struct sCsrNeighborRoamControlInfo {
|
||||
|
|
@ -164,7 +162,6 @@ typedef struct sCsrNeighborRoamControlInfo {
|
|||
bool isVOAdmitted;
|
||||
uint16_t MinQBssLoadRequired;
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
/*
|
||||
* Previous connected profile.
|
||||
* If the new profile does not match previous we re-initialize
|
||||
|
|
@ -175,7 +172,6 @@ typedef struct sCsrNeighborRoamControlInfo {
|
|||
uint8_t uOsRequestedHandoff;
|
||||
/* handoff related info came with upper layer's req for reassoc */
|
||||
tCsrHandoffRequest handoffReqInfo;
|
||||
#endif
|
||||
uint8_t currentRoamBmissFirstBcnt;
|
||||
uint8_t currentRoamBmissFinalBcnt;
|
||||
uint8_t currentRoamBeaconRssiWeight;
|
||||
|
|
|
|||
|
|
@ -93,19 +93,14 @@ typedef struct _smeConfigParams {
|
|||
#if defined WLAN_FEATURE_VOWIFI
|
||||
struct rrm_config_param rrmConfig;
|
||||
#endif
|
||||
#if defined FEATURE_WLAN_LFR
|
||||
uint8_t isFastRoamIniFeatureEnabled;
|
||||
uint8_t MAWCEnabled;
|
||||
#endif
|
||||
#if defined FEATURE_WLAN_ESE
|
||||
uint8_t isEseIniFeatureEnabled;
|
||||
#endif
|
||||
#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || \
|
||||
defined(FEATURE_WLAN_LFR)
|
||||
uint8_t isFastTransitionEnabled;
|
||||
uint8_t RoamRssiDiff;
|
||||
bool isWESModeEnabled;
|
||||
#endif
|
||||
uint8_t isAmsduSupportInAMPDU;
|
||||
bool pnoOffload;
|
||||
uint8_t fEnableDebugLog;
|
||||
|
|
@ -572,8 +567,6 @@ CDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel,
|
|||
void sme_feature_caps_exchange(tHalHandle hHal);
|
||||
void sme_disable_feature_capablity(uint8_t feature_index);
|
||||
void sme_reset_power_values_for5_g(tHalHandle hHal);
|
||||
#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || \
|
||||
defined(FEATURE_WLAN_LFR)
|
||||
CDF_STATUS sme_update_roam_prefer5_g_hz(tHalHandle hHal, bool nRoamPrefer5GHz);
|
||||
CDF_STATUS sme_set_roam_intra_band(tHalHandle hHal, const bool nRoamIntraBand);
|
||||
CDF_STATUS sme_update_roam_scan_n_probes(tHalHandle hHal, uint8_t sessionId,
|
||||
|
|
@ -594,9 +587,7 @@ CDF_STATUS sme_update_wes_mode(tHalHandle hHal, bool isWESModeEnabled,
|
|||
uint8_t sessionId);
|
||||
CDF_STATUS sme_set_roam_scan_control(tHalHandle hHal, uint8_t sessionId,
|
||||
bool roamScanControl);
|
||||
#endif /* (WLAN_FEATURE_VOWIFI_11R)||(FEATURE_WLAN_ESE)||(FEATURE_WLAN_LFR) */
|
||||
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
CDF_STATUS sme_update_is_fast_roam_ini_feature_enabled(tHalHandle hHal,
|
||||
uint8_t sessionId,
|
||||
const bool
|
||||
|
|
@ -608,7 +599,6 @@ CDF_STATUS sme_start_roaming(tHalHandle hHal, uint8_t sessionId,
|
|||
uint8_t reason);
|
||||
CDF_STATUS sme_update_enable_fast_roam_in_concurrency(tHalHandle hHal,
|
||||
bool bFastRoamInConIniFeatureEnabled);
|
||||
#endif /* FEATURE_WLAN_LFR */
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
CDF_STATUS sme_update_is_ese_feature_enabled(tHalHandle hHal, uint8_t sessionId,
|
||||
const bool isEseIniFeatureEnabled);
|
||||
|
|
@ -664,8 +654,6 @@ uint8_t sme_get_roam_bmiss_final_bcnt(tHalHandle hHal);
|
|||
CDF_STATUS sme_set_roam_beacon_rssi_weight(tHalHandle hHal, uint8_t sessionId,
|
||||
const uint8_t nRoamBeaconRssiWeight);
|
||||
uint8_t sme_get_roam_beacon_rssi_weight(tHalHandle hHal);
|
||||
#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || \
|
||||
defined(FEATURE_WLAN_LFR)
|
||||
uint8_t sme_get_roam_rssi_diff(tHalHandle hHal);
|
||||
CDF_STATUS sme_change_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId,
|
||||
uint8_t *pChannelList,
|
||||
|
|
@ -683,7 +671,6 @@ bool sme_get_wes_mode(tHalHandle hHal);
|
|||
bool sme_get_roam_scan_control(tHalHandle hHal);
|
||||
bool sme_get_is_lfr_feature_enabled(tHalHandle hHal);
|
||||
bool sme_get_is_ft_feature_enabled(tHalHandle hHal);
|
||||
#endif
|
||||
CDF_STATUS sme_update_roam_scan_offload_enabled(tHalHandle hHal,
|
||||
bool nRoamScanOffloadEnabled);
|
||||
uint8_t sme_is_feature_supported_by_fw(uint8_t featEnumValue);
|
||||
|
|
|
|||
|
|
@ -264,8 +264,6 @@ CDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type,
|
|||
void *pMsgBuf);
|
||||
#endif /* FEATURE_WLAN_TDLS */
|
||||
|
||||
#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || \
|
||||
defined(FEATURE_WLAN_LFR)
|
||||
CDF_STATUS csr_flush_cfg_bg_scan_roam_channel_list(tpAniSirGlobal pMac,
|
||||
uint8_t sessionId);
|
||||
CDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal pMac,
|
||||
|
|
@ -273,7 +271,6 @@ CDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal pMac,
|
|||
const uint8_t numChannels);
|
||||
CDF_STATUS csr_update_bg_scan_config_ini_channel_list(tpAniSirGlobal pMac,
|
||||
uint8_t sessionId, eCsrBand eBand);
|
||||
#endif
|
||||
|
||||
#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
|
||||
CDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac,
|
||||
|
|
|
|||
|
|
@ -8011,7 +8011,6 @@ void sme_reset_power_values_for5_g(tHalHandle hHal)
|
|||
csr_apply_power2_current(pMac); /* Store the channel+power info in the global place: Cfg */
|
||||
}
|
||||
|
||||
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
|
||||
/* ---------------------------------------------------------------------------
|
||||
\fn sme_update_roam_prefer5_g_hz
|
||||
\brief enable/disable Roam prefer 5G runtime option
|
||||
|
|
@ -8380,9 +8379,7 @@ CDF_STATUS sme_set_roam_scan_control(tHalHandle hHal, uint8_t sessionId,
|
|||
}
|
||||
return status;
|
||||
}
|
||||
#endif /* (WLAN_FEATURE_VOWIFI_11R) || (FEATURE_WLAN_ESE) || (FEATURE_WLAN_LFR) */
|
||||
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
/*--------------------------------------------------------------------------
|
||||
\brief sme_update_is_fast_roam_ini_feature_enabled() - enable/disable LFR
|
||||
support at runtime
|
||||
|
|
@ -8532,7 +8529,6 @@ CDF_STATUS sme_update_enable_fast_roam_in_concurrency(tHalHandle hHal,
|
|||
|
||||
return status;
|
||||
}
|
||||
#endif /* FEATURE_WLAN_LFR */
|
||||
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
/*--------------------------------------------------------------------------
|
||||
|
|
@ -9424,7 +9420,6 @@ uint16_t sme_get_neighbor_scan_period(tHalHandle hHal, uint8_t sessionId)
|
|||
}
|
||||
|
||||
|
||||
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
|
||||
|
||||
/*--------------------------------------------------------------------------
|
||||
\brief sme_get_roam_rssi_diff() - get Roam rssi diff
|
||||
|
|
@ -9670,7 +9665,6 @@ bool sme_get_roam_scan_control(tHalHandle hHal)
|
|||
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
|
||||
return pMac->roam.configParam.nRoamScanControl;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*--------------------------------------------------------------------------
|
||||
\brief sme_get_is_lfr_feature_enabled() - get LFR feature enabled or not
|
||||
|
|
@ -9682,12 +9676,8 @@ bool sme_get_roam_scan_control(tHalHandle hHal)
|
|||
--------------------------------------------------------------------------*/
|
||||
bool sme_get_is_lfr_feature_enabled(tHalHandle hHal)
|
||||
{
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
|
||||
return pMac->roam.configParam.isFastRoamIniFeatureEnabled;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -1336,7 +1336,6 @@ CDF_STATUS csr_flush_roam_scan_roam_channel_list(tpAniSirGlobal pMac,
|
|||
}
|
||||
#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
|
||||
|
||||
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
|
||||
/*
|
||||
This function flushes the roam scan cache
|
||||
*/
|
||||
|
|
@ -1390,7 +1389,6 @@ CDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal pMac,
|
|||
return status;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
|
||||
/*
|
||||
|
|
@ -1853,7 +1851,6 @@ CDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac,
|
|||
pMac->roam.configParam.csr11rConfig.
|
||||
IsFTResourceReqSupported);
|
||||
#endif
|
||||
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
|
||||
pMac->roam.configParam.isFastTransitionEnabled =
|
||||
pParam->isFastTransitionEnabled;
|
||||
pMac->roam.configParam.RoamRssiDiff = pParam->RoamRssiDiff;
|
||||
|
|
@ -1865,16 +1862,13 @@ CDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac,
|
|||
pMac->roam.configParam.nProbes = pParam->nProbes;
|
||||
pMac->roam.configParam.nRoamScanHomeAwayTime =
|
||||
pParam->nRoamScanHomeAwayTime;
|
||||
#endif
|
||||
pMac->roam.configParam.isRoamOffloadScanEnabled =
|
||||
pParam->isRoamOffloadScanEnabled;
|
||||
pMac->roam.configParam.bFastRoamInConIniFeatureEnabled =
|
||||
pParam->bFastRoamInConIniFeatureEnabled;
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
pMac->roam.configParam.isFastRoamIniFeatureEnabled =
|
||||
pParam->isFastRoamIniFeatureEnabled;
|
||||
pMac->roam.configParam.MAWCEnabled = pParam->MAWCEnabled;
|
||||
#endif
|
||||
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
pMac->roam.configParam.isEseIniFeatureEnabled =
|
||||
|
|
@ -2093,7 +2087,6 @@ CDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam)
|
|||
cdf_mem_copy(&cfg_params->csr11rConfig, &pParam->csr11rConfig,
|
||||
sizeof(tCsr11rConfigParams));
|
||||
#endif
|
||||
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
|
||||
pParam->isFastTransitionEnabled = cfg_params->isFastTransitionEnabled;
|
||||
pParam->RoamRssiDiff = cfg_params->RoamRssiDiff;
|
||||
pParam->nRoamPrefer5GHz = cfg_params->nRoamPrefer5GHz;
|
||||
|
|
@ -2101,14 +2094,11 @@ CDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam)
|
|||
pParam->isWESModeEnabled = cfg_params->isWESModeEnabled;
|
||||
pParam->nProbes = cfg_params->nProbes;
|
||||
pParam->nRoamScanHomeAwayTime = cfg_params->nRoamScanHomeAwayTime;
|
||||
#endif
|
||||
pParam->isRoamOffloadScanEnabled = cfg_params->isRoamOffloadScanEnabled;
|
||||
pParam->bFastRoamInConIniFeatureEnabled =
|
||||
cfg_params->bFastRoamInConIniFeatureEnabled;
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
pParam->isFastRoamIniFeatureEnabled =
|
||||
cfg_params->isFastRoamIniFeatureEnabled;
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
pParam->isEseIniFeatureEnabled = cfg_params->isEseIniFeatureEnabled;
|
||||
#endif
|
||||
|
|
@ -5443,7 +5433,6 @@ bool csr_roam_is_ese_assoc(tpAniSirGlobal pMac, uint8_t sessionId)
|
|||
return csr_neighbor_roam_is_ese_assoc(pMac, sessionId);
|
||||
}
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
/* Returns whether "Legacy Fast Roaming" is currently enabled...or not */
|
||||
bool csr_roam_is_fast_roam_enabled(tpAniSirGlobal pMac, uint32_t sessionId)
|
||||
{
|
||||
|
|
@ -5488,7 +5477,6 @@ bool csr_roam_is_roam_offload_scan_enabled(tpAniSirGlobal pMac)
|
|||
{
|
||||
return pMac->roam.configParam.isRoamOffloadScanEnabled;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(FEATURE_WLAN_ESE)
|
||||
bool csr_roam_is_ese_ini_feature_enabled(tpAniSirGlobal pMac)
|
||||
|
|
@ -8449,19 +8437,16 @@ csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx,
|
|||
session_id);
|
||||
} else
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
if (csr_roam_is_handoff_in_progress(mac_ctx, session_id)
|
||||
&& csr_roam_is_fast_roam_enabled(mac_ctx, session_id)) {
|
||||
/* Now serialize the reassoc command. */
|
||||
status = csr_roam_issue_reassociate_cmd(mac_ctx,
|
||||
session_id);
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
/*
|
||||
* else we are not connected and attempting to Join. Issue the
|
||||
* Join request.
|
||||
*/
|
||||
} else {
|
||||
/*
|
||||
* else we are not connected and attempting to Join.
|
||||
* Issue the Join request.
|
||||
*/
|
||||
status = csr_roam_issue_join(mac_ctx, session_id,
|
||||
bss_desc,
|
||||
(tDot11fBeaconIEs *)
|
||||
|
|
@ -8514,8 +8499,6 @@ static void csr_roam_roaming_state_reassoc_rsp_processor(tpAniSirGlobal pMac,
|
|||
"CSR SmeReassocReq failed with statusCode= 0x%08X [%d]",
|
||||
pSmeJoinRsp->statusCode, pSmeJoinRsp->statusCode);
|
||||
result = eCsrReassocFailure;
|
||||
#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || \
|
||||
defined(FEATURE_WLAN_LFR)
|
||||
if ((eSIR_SME_FT_REASSOC_TIMEOUT_FAILURE ==
|
||||
pSmeJoinRsp->statusCode)
|
||||
|| (eSIR_SME_FT_REASSOC_FAILURE ==
|
||||
|
|
@ -8544,7 +8527,6 @@ static void csr_roam_roaming_state_reassoc_rsp_processor(tpAniSirGlobal pMac,
|
|||
return;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
/* In the event that the Reassociation fails, then we need to Disassociate the current association and keep */
|
||||
/* roaming. Note that we will attempt to Join the AP instead of a Reassoc since we may have attempted a */
|
||||
/* 'Reassoc to self', which AP's that don't support Reassoc will force a Disassoc. */
|
||||
|
|
@ -10045,12 +10027,10 @@ csr_roam_chk_lnk_disassoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr)
|
|||
csr_neighbor_roam_tranistion_preauth_done_to_disconnected(
|
||||
mac_ctx, sessionId);
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
if (csr_roam_is_fast_roam_enabled(mac_ctx, sessionId) &&
|
||||
(csr_neighbor_roam_state_preauth_done(mac_ctx, sessionId)))
|
||||
csr_neighbor_roam_tranistion_preauth_done_to_disconnected(
|
||||
mac_ctx, sessionId);
|
||||
#endif
|
||||
session = CSR_GET_SESSION(mac_ctx, sessionId);
|
||||
if (!session) {
|
||||
sms_log(mac_ctx, LOGE, FL("session %d not found"), sessionId);
|
||||
|
|
@ -10131,12 +10111,10 @@ csr_roam_chk_lnk_deauth_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr)
|
|||
csr_neighbor_roam_tranistion_preauth_done_to_disconnected(
|
||||
mac_ctx, sessionId);
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
if (csr_roam_is_fast_roam_enabled(mac_ctx, sessionId) &&
|
||||
(csr_neighbor_roam_state_preauth_done(mac_ctx, sessionId)))
|
||||
csr_neighbor_roam_tranistion_preauth_done_to_disconnected(
|
||||
mac_ctx, sessionId);
|
||||
#endif
|
||||
session = CSR_GET_SESSION(mac_ctx, sessionId);
|
||||
if (!session) {
|
||||
sms_log(mac_ctx, LOGE, FL("session %d not found"), sessionId);
|
||||
|
|
@ -11115,7 +11093,6 @@ void csr_roam_wait_for_key_time_out_handler(void *pv)
|
|||
curSubState[pInfo->sessionId]));
|
||||
|
||||
if (CSR_IS_WAIT_FOR_KEY(pMac, pInfo->sessionId)) {
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
if (csr_neighbor_roam_is_handoff_in_progress(pMac, pInfo->sessionId)) {
|
||||
/*
|
||||
* Enable heartbeat timer when hand-off is in progress
|
||||
|
|
@ -11128,7 +11105,6 @@ void csr_roam_wait_for_key_time_out_handler(void *pv)
|
|||
cfg_set_int(pMac, WNI_CFG_HEART_BEAT_THRESHOLD,
|
||||
pMac->roam.configParam.HeartbeatThresh24);
|
||||
}
|
||||
#endif
|
||||
sms_log(pMac, LOGE, " SME pre-auth state timeout. ");
|
||||
|
||||
/* Change the substate so command queue is unblocked. */
|
||||
|
|
@ -11160,23 +11136,19 @@ CDF_STATUS csr_roam_start_wait_for_key_timer(tpAniSirGlobal pMac, uint32_t inter
|
|||
tpCsrNeighborRoamControlInfo pNeighborRoamInfo =
|
||||
&pMac->roam.neighborRoamInfo[pMac->roam.WaitForKeyTimerInfo.
|
||||
sessionId];
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
if (csr_neighbor_roam_is_handoff_in_progress(pMac,
|
||||
pMac->roam.WaitForKeyTimerInfo.
|
||||
sessionId)) {
|
||||
pMac->roam.WaitForKeyTimerInfo.
|
||||
sessionId)) {
|
||||
/* Disable heartbeat timer when hand-off is in progress */
|
||||
sms_log(pMac, LOG2,
|
||||
FL("disabling HB timer in state=%s sub-state=%s"),
|
||||
mac_trace_get_neighbour_roam_state(pNeighborRoamInfo->
|
||||
neighborRoamState),
|
||||
mac_trace_getcsr_roam_sub_state(pMac->roam.
|
||||
curSubState[pMac->roam.
|
||||
WaitForKeyTimerInfo.
|
||||
sessionId]
|
||||
));
|
||||
mac_trace_get_neighbour_roam_state(
|
||||
pNeighborRoamInfo->neighborRoamState),
|
||||
mac_trace_getcsr_roam_sub_state(
|
||||
pMac->roam.curSubState[pMac->roam.
|
||||
WaitForKeyTimerInfo.sessionId]));
|
||||
cfg_set_int(pMac, WNI_CFG_HEART_BEAT_THRESHOLD, 0);
|
||||
}
|
||||
#endif
|
||||
sms_log(pMac, LOG1, " csrScanStartWaitForKeyTimer");
|
||||
status = cdf_mc_timer_start(&pMac->roam.hTimerWaitForKey,
|
||||
interval / CDF_MC_TIMER_TO_MS_UNIT);
|
||||
|
|
@ -11198,7 +11170,6 @@ CDF_STATUS csr_roam_stop_wait_for_key_timer(tpAniSirGlobal pMac)
|
|||
curSubState[pMac->roam.
|
||||
WaitForKeyTimerInfo.
|
||||
sessionId]));
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
if (csr_neighbor_roam_is_handoff_in_progress(pMac,
|
||||
pMac->roam.WaitForKeyTimerInfo.
|
||||
sessionId)) {
|
||||
|
|
@ -11212,7 +11183,6 @@ CDF_STATUS csr_roam_stop_wait_for_key_timer(tpAniSirGlobal pMac)
|
|||
cfg_set_int(pMac, WNI_CFG_HEART_BEAT_THRESHOLD,
|
||||
pMac->roam.configParam.HeartbeatThresh24);
|
||||
}
|
||||
#endif
|
||||
return cdf_mc_timer_stop(&pMac->roam.hTimerWaitForKey);
|
||||
}
|
||||
|
||||
|
|
@ -13764,23 +13734,16 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
|
|||
}
|
||||
}
|
||||
#endif /* FEATURE_WLAN_ESE */
|
||||
#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
|
||||
if (ese_config
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
|| csr_roam_is_fast_roam_enabled(pMac, sessionId)
|
||||
#endif
|
||||
) {
|
||||
|| csr_roam_is_fast_roam_enabled(pMac, sessionId)) {
|
||||
csr_join_req->isFastTransitionEnabled = true;
|
||||
} else {
|
||||
csr_join_req->isFastTransitionEnabled = false;
|
||||
}
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
if (csr_roam_is_fast_roam_enabled(pMac, sessionId))
|
||||
csr_join_req->isFastRoamIniFeatureEnabled = true;
|
||||
else
|
||||
csr_join_req->isFastRoamIniFeatureEnabled = false;
|
||||
#endif
|
||||
|
||||
csr_join_req->txLdpcIniFeatureEnabled =
|
||||
(uint8_t) pMac->roam.configParam.txLdpcEnable;
|
||||
|
|
@ -17696,9 +17659,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal,
|
|||
{
|
||||
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
|
||||
CDF_STATUS status = CDF_STATUS_SUCCESS;
|
||||
#if defined(FEATURE_WLAN_LFR) || defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_ESE_UPLOAD)
|
||||
tCsrRoamInfo roamInfo;
|
||||
#endif
|
||||
eCsrAuthType conn_Auth_type;
|
||||
uint32_t sessionId = pFTPreAuthRsp->smeSessionId;
|
||||
tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId);
|
||||
|
|
@ -17772,7 +17733,6 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal,
|
|||
}
|
||||
#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
|
||||
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
/* If Legacy Fast Roaming is enabled, signal the supplicant */
|
||||
/* So he can send us a PMK-ID for this candidate AP. */
|
||||
if (csr_roam_is_fast_roam_enabled(pMac, pFTPreAuthRsp->smeSessionId)) {
|
||||
|
|
@ -17783,7 +17743,6 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal,
|
|||
csr_roam_call_callback(pMac, pFTPreAuthRsp->smeSessionId,
|
||||
&roamInfo, 0, eCSR_ROAM_PMK_NOTIFY, 0);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* If its an Open Auth, FT IEs are not provided by supplicant */
|
||||
/* Hence populate them here */
|
||||
|
|
|
|||
|
|
@ -1467,13 +1467,11 @@ static uint32_t csr_get_bss_cap_value(tpAniSirGlobal pMac,
|
|||
tDot11fBeaconIEs *pIes)
|
||||
{
|
||||
uint32_t ret = CSR_BSS_CAP_VALUE_NONE;
|
||||
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
|
||||
if (CSR_IS_ROAM_PREFER_5GHZ(pMac) || CSR_IS_SELECT_5G_PREFERRED(pMac)) {
|
||||
if ((pBssDesc) && CDS_IS_CHANNEL_5GHZ(pBssDesc->channelId)) {
|
||||
ret += CSR_BSS_CAP_VALUE_5GHZ;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
/*
|
||||
* if strict select 5GHz is non-zero then ignore the capability checking
|
||||
*/
|
||||
|
|
@ -1579,7 +1577,6 @@ static bool csr_is_better_bss(tpAniSirGlobal mac_ctx,
|
|||
return ret;
|
||||
}
|
||||
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
/* Add the channel to the occupiedChannels array */
|
||||
static void csr_scan_add_to_occupied_channels(tpAniSirGlobal pMac,
|
||||
tCsrScanResult *pResult,
|
||||
|
|
@ -1611,17 +1608,14 @@ static void csr_scan_add_to_occupied_channels(tpAniSirGlobal pMac,
|
|||
CSR_BG_SCAN_OCCUPIED_CHANNEL_LIST_LEN;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Put the BSS into the scan result list */
|
||||
/* pIes can not be NULL */
|
||||
static void csr_scan_add_result(tpAniSirGlobal pMac, tCsrScanResult *pResult,
|
||||
tDot11fBeaconIEs *pIes, uint32_t sessionId)
|
||||
{
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
tpCsrNeighborRoamControlInfo pNeighborRoamInfo =
|
||||
&pMac->roam.neighborRoamInfo[sessionId];
|
||||
#endif
|
||||
|
||||
struct cdf_mac_addr bssid;
|
||||
uint8_t channel_id = pResult->Result.BssDescriptor.channelId;
|
||||
|
|
@ -1635,7 +1629,6 @@ static void csr_scan_add_result(tpAniSirGlobal pMac, tCsrScanResult *pResult,
|
|||
&pResult->Result.BssDescriptor, pIes);
|
||||
csr_ll_insert_tail(&pMac->scan.scanResultList, &pResult->Link,
|
||||
LL_ACCESS_LOCK);
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
if (0 == pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels) {
|
||||
/*
|
||||
* Build the occupied channel list, only if
|
||||
|
|
@ -1644,7 +1637,6 @@ static void csr_scan_add_result(tpAniSirGlobal pMac, tCsrScanResult *pResult,
|
|||
csr_scan_add_to_occupied_channels(pMac, pResult, sessionId,
|
||||
&pMac->scan.occupiedChannels[sessionId], pIes);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -5260,7 +5252,6 @@ static void csr_scan_copy_request_valid_channels_only(tpAniSirGlobal mac_ctx,
|
|||
ChannelList
|
||||
[index])))
|
||||
) {
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
sms_log(mac_ctx, LOG2,
|
||||
FL(" reqType= %s (%d), numOfChannels=%d, ignoring DFS channel %d"),
|
||||
sme_request_type_to_string(
|
||||
|
|
@ -5269,7 +5260,6 @@ static void csr_scan_copy_request_valid_channels_only(tpAniSirGlobal mac_ctx,
|
|||
src_req->ChannelInfo.numOfChannels,
|
||||
src_req->ChannelInfo.ChannelList
|
||||
[index]);
|
||||
#endif
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -5663,9 +5653,7 @@ static void csr_sta_ap_conc_timer_handler(void *pv)
|
|||
|
||||
if ((num_chn > numchan_combinedconc) &&
|
||||
((csr_is_sta_session_connected(mac_ctx) &&
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
(csr_is_concurrent_infra_connected(mac_ctx)) &&
|
||||
#endif
|
||||
(scan_cmd->u.scanCmd.u.scanRequest.p2pSearch != 1)) ||
|
||||
(csr_is_p2p_session_connected(mac_ctx)))) {
|
||||
cdf_mem_set(&scan_req, sizeof(tCsrScanRequest), 0);
|
||||
|
|
@ -6953,7 +6941,6 @@ CDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac,
|
|||
}
|
||||
#endif /* FEATURE_WLAN_SCAN_PNO */
|
||||
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
void csr_init_occupied_channels_list(tpAniSirGlobal pMac, uint8_t sessionId)
|
||||
{
|
||||
tListElem *pEntry = NULL;
|
||||
|
|
@ -7006,7 +6993,6 @@ void csr_init_occupied_channels_list(tpAniSirGlobal pMac, uint8_t sessionId)
|
|||
} /* while */
|
||||
csr_ll_unlock(&pMac->scan.scanResultList);
|
||||
}
|
||||
#endif
|
||||
|
||||
CDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal pMac,
|
||||
uint32_t sessionId,
|
||||
|
|
|
|||
|
|
@ -88,9 +88,7 @@
|
|||
#define CSR_BSS_CAP_VALUE_VHT 2
|
||||
#define CSR_BSS_CAP_VALUE_WMM 1
|
||||
#define CSR_BSS_CAP_VALUE_UAPSD 1
|
||||
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
|
||||
#define CSR_BSS_CAP_VALUE_5GHZ 2
|
||||
#endif
|
||||
#define CSR_DEFAULT_ROAMING_TIME 10 /* 10 seconds */
|
||||
|
||||
#define CSR_ROAMING_DFS_CHANNEL_DISABLED (0)
|
||||
|
|
@ -1027,7 +1025,6 @@ CDF_STATUS csr_roam_enqueue_preauth(tpAniSirGlobal pMac, uint32_t sessionId,
|
|||
tpSirBssDescription pBssDescription,
|
||||
eCsrRoamReason reason, bool fImmediate);
|
||||
CDF_STATUS csr_dequeue_roam_command(tpAniSirGlobal pMac, eCsrRoamReason reason);
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
void csr_init_occupied_channels_list(tpAniSirGlobal pMac, uint8_t sessionId);
|
||||
bool csr_neighbor_roam_is_new_connected_profile(tpAniSirGlobal pMac,
|
||||
uint8_t sessionId);
|
||||
|
|
@ -1035,7 +1032,6 @@ bool csr_neighbor_roam_connected_profile_match(tpAniSirGlobal pMac,
|
|||
uint8_t sessionId,
|
||||
tCsrScanResult *pResult,
|
||||
tDot11fBeaconIEs *pIes);
|
||||
#endif
|
||||
|
||||
CDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal pMac,
|
||||
uint32_t sessionId,
|
||||
|
|
|
|||
|
|
@ -645,11 +645,9 @@ static void csr_neighbor_roam_reset_preauth_control_info(tpAniSirGlobal pMac,
|
|||
tpCsrNeighborRoamControlInfo pNeighborRoamInfo =
|
||||
&pMac->roam.neighborRoamInfo[sessionId];
|
||||
|
||||
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
|
||||
pNeighborRoamInfo->is11rAssoc = false;
|
||||
/* Purge pre-auth fail list */
|
||||
csr_neighbor_roam_purge_preauth_failed_list(pMac);
|
||||
#endif
|
||||
|
||||
pNeighborRoamInfo->FTRoamInfo.preauthRspPending = false;
|
||||
pNeighborRoamInfo->FTRoamInfo.numPreAuthRetries = 0;
|
||||
|
|
@ -1473,7 +1471,6 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
|
|||
"SKIP-currently associated AP");
|
||||
continue;
|
||||
}
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
/*
|
||||
* In case of reassoc requested by upper layer, look
|
||||
* for exact match of bssid & channel. csr cache might
|
||||
|
|
@ -1490,7 +1487,6 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
|
|||
"SKIP-not a candidate AP for OS requested roam");
|
||||
continue;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
if ((n_roam_info->is11rAssoc) &&
|
||||
|
|
@ -1537,7 +1533,6 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
|
|||
}
|
||||
#endif /* FEATURE_WLAN_ESE */
|
||||
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
/*
|
||||
* If we are supporting legacy roaming, and
|
||||
* if the candidate is on the "pre-auth failed" list,
|
||||
|
|
@ -1550,7 +1545,6 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
|
|||
FL("BSSID present in pre-auth fail list.. Ignoring"));
|
||||
continue;
|
||||
}
|
||||
#endif /* FEATURE_WLAN_LFR */
|
||||
|
||||
/* check the age of the AP */
|
||||
age_ticks = (uint32_t) cdf_mc_timer_get_system_ticks() -
|
||||
|
|
@ -2012,7 +2006,6 @@ CDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGloba
|
|||
}
|
||||
#endif /* WLAN_FEATURE_VOWIFI_11R */
|
||||
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
/**
|
||||
* csr_neighbor_roam_is_ssid_and_security_match() - to match ssid/security
|
||||
* @pMac: Pointer to mac context
|
||||
|
|
@ -2210,7 +2203,6 @@ csr_neighbor_roam_prepare_non_occupied_channel_list(tpAniSirGlobal pMac,
|
|||
*pOutputNumOfChannels = outputNumOfChannels;
|
||||
return CDF_STATUS_SUCCESS;
|
||||
}
|
||||
#endif /* FEATURE_WLAN_LFR */
|
||||
|
||||
/**
|
||||
* csr_roam_reset_roam_params - API to reset the roaming parameters
|
||||
|
|
@ -2255,10 +2247,8 @@ CDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac,
|
|||
{
|
||||
tpCsrNeighborRoamControlInfo pNeighborRoamInfo =
|
||||
&pMac->roam.neighborRoamInfo[sessionId];
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
tCsrRoamConnectedProfile *pPrevProfile =
|
||||
&pNeighborRoamInfo->prevConnProfile;
|
||||
#endif
|
||||
tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId);
|
||||
tCsrRoamSession *roam_session = NULL;
|
||||
|
||||
|
|
@ -2271,14 +2261,12 @@ CDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac,
|
|||
MAC_ADDRESS_STR), sessionId,
|
||||
pNeighborRoamInfo->neighborRoamState,
|
||||
MAC_ADDR_ARRAY(pSession->connectedProfile.bssid.bytes));
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
/*
|
||||
* Free the current previous profile and move
|
||||
* the current profile to prev profile.
|
||||
*/
|
||||
csr_roam_free_connect_profile(pMac, pPrevProfile);
|
||||
csr_roam_copy_connect_profile(pMac, sessionId, pPrevProfile);
|
||||
#endif
|
||||
/*
|
||||
* clear the roaming parameters that are per connection.
|
||||
* For a new connection, they have to be programmed again.
|
||||
|
|
@ -2402,11 +2390,8 @@ static void csr_neighbor_roam_info_ctx_init(
|
|||
&pMac->roam.neighborRoamInfo[session_id];
|
||||
tCsrRoamSession *session = &pMac->roam.roamSession[session_id];
|
||||
|
||||
#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
|
||||
int init_ft_flag = false;
|
||||
#endif
|
||||
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
/*
|
||||
* Initialize the occupied list ONLY if we are
|
||||
* transitioning from INIT state to CONNECTED state.
|
||||
|
|
@ -2414,7 +2399,6 @@ static void csr_neighbor_roam_info_ctx_init(
|
|||
if (eCSR_NEIGHBOR_ROAM_STATE_INIT ==
|
||||
ngbr_roam_info->neighborRoamState)
|
||||
csr_init_occupied_channels_list(pMac, session_id);
|
||||
#endif
|
||||
CSR_NEIGHBOR_ROAM_STATE_TRANSITION
|
||||
(pMac, eCSR_NEIGHBOR_ROAM_STATE_CONNECTED, session_id);
|
||||
|
||||
|
|
@ -2435,13 +2419,11 @@ static void csr_neighbor_roam_info_ctx_init(
|
|||
ngbr_roam_info->currentRoamBeaconRssiWeight =
|
||||
ngbr_roam_info->cfgParams.nRoamBeaconRssiWeight;
|
||||
|
||||
#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
|
||||
/**
|
||||
* Now we can clear the preauthDone that
|
||||
* was saved as we are connected afresh */
|
||||
csr_neighbor_roam_free_roamable_bss_list(pMac,
|
||||
&ngbr_roam_info->FTRoamInfo.preAuthDoneList);
|
||||
#endif
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
/* Based on the auth scheme tell if we are 11r */
|
||||
|
|
@ -2469,12 +2451,9 @@ static void csr_neighbor_roam_info_ctx_init(
|
|||
FL("isESEAssoc is = %d ft = %d"),
|
||||
ngbr_roam_info->isESEAssoc, init_ft_flag);
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
/* If "Legacy Fast Roaming" is enabled */
|
||||
if (csr_roam_is_fast_roam_enabled(pMac, session_id))
|
||||
init_ft_flag = true;
|
||||
#endif
|
||||
#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
|
||||
if (init_ft_flag == false)
|
||||
return;
|
||||
/* Initialize all the data structures needed for the 11r FT Preauth */
|
||||
|
|
@ -2511,7 +2490,6 @@ static void csr_neighbor_roam_info_ctx_init(
|
|||
ROAM_SCAN_OFFLOAD_START,
|
||||
REASON_CONNECT);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -2811,10 +2789,8 @@ CDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId)
|
|||
pNeighborRoamInfo->cfgParams.nRoamBmissFinalBcnt;
|
||||
pNeighborRoamInfo->currentRoamBeaconRssiWeight =
|
||||
pNeighborRoamInfo->cfgParams.nRoamBeaconRssiWeight;
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
cdf_mem_set(&pNeighborRoamInfo->prevConnProfile,
|
||||
sizeof(tCsrRoamConnectedProfile), 0);
|
||||
#endif
|
||||
|
||||
status = csr_ll_open(pMac->hHdd, &pNeighborRoamInfo->roamableAPList);
|
||||
if (CDF_STATUS_SUCCESS != status) {
|
||||
|
|
@ -2905,9 +2881,7 @@ void csr_neighbor_roam_close(tpAniSirGlobal pMac, uint8_t sessionId)
|
|||
|
||||
/* Free the profile.. */
|
||||
csr_release_profile(pMac, &pNeighborRoamInfo->csrNeighborRoamProfile);
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
csr_roam_free_connect_profile(pMac, &pNeighborRoamInfo->prevConnProfile);
|
||||
#endif
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
pNeighborRoamInfo->FTRoamInfo.currentNeighborRptRetryNum = 0;
|
||||
pNeighborRoamInfo->FTRoamInfo.numBssFromNeighborReport = 0;
|
||||
|
|
@ -3115,7 +3089,6 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac,
|
|||
preAuthDoneList));
|
||||
} else
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
if (csr_roam_is_fast_roam_enabled(pMac, session_id)) {
|
||||
/* Always the BSS info in the head is the handoff candidate */
|
||||
bss_node =
|
||||
|
|
@ -3126,9 +3099,7 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac,
|
|||
FL("Number of Handoff candidates = %d"),
|
||||
csr_ll_count(
|
||||
&ngbr_roam_info->FTRoamInfo.preAuthDoneList));
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
} else {
|
||||
bss_node =
|
||||
csr_neighbor_roam_next_roamable_ap(pMac,
|
||||
&ngbr_roam_info->roamableAPList,
|
||||
|
|
|
|||
|
|
@ -3748,16 +3748,13 @@ uint8_t csr_retrieve_rsn_ie(tHalHandle hHal, uint32_t sessionId,
|
|||
do {
|
||||
if (!csr_is_profile_rsn(pProfile))
|
||||
break;
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
if (csr_roam_is_fast_roam_enabled(pMac, sessionId)) {
|
||||
/* If "Legacy Fast Roaming" is enabled ALWAYS rebuild the RSN IE from */
|
||||
/* scratch. So it contains the current PMK-IDs */
|
||||
cbRsnIe =
|
||||
csr_construct_rsn_ie(pMac, sessionId, pProfile,
|
||||
pSirBssDesc, pIes, pRsnIe);
|
||||
} else
|
||||
#endif
|
||||
if (pProfile->nRSNReqIELength && pProfile->pRSNReqIE) {
|
||||
} else if (pProfile->nRSNReqIELength && pProfile->pRSNReqIE) {
|
||||
/* If you have one started away, re-use it. */
|
||||
if (SIR_MAC_WPA_IE_MAX_LENGTH >=
|
||||
pProfile->nRSNReqIELength) {
|
||||
|
|
@ -5589,7 +5586,6 @@ void csr_disconnect_all_active_sessions(tpAniSirGlobal pMac)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef FEATURE_WLAN_LFR
|
||||
bool csr_is_channel_present_in_list(uint8_t *pChannelList,
|
||||
int numChannels, uint8_t channel)
|
||||
{
|
||||
|
|
@ -5649,7 +5645,6 @@ CDF_STATUS csr_add_to_channel_list_front(uint8_t *pChannelList,
|
|||
|
||||
return CDF_STATUS_SUCCESS;
|
||||
}
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_DIAG_SUPPORT
|
||||
/**
|
||||
* csr_diag_event_report() - send PE diag event
|
||||
|
|
|
|||
|
|
@ -987,13 +987,11 @@ CDF_STATUS sme_qos_csr_event_ind(tpAniSirGlobal pMac,
|
|||
sme_qos_process_preauth_success_ind(pMac, sessionId,
|
||||
pEvent_info);
|
||||
break;
|
||||
#if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
|
||||
case SME_QOS_CSR_SET_KEY_SUCCESS_IND:
|
||||
status =
|
||||
sme_qos_process_set_key_success_ind(pMac, sessionId,
|
||||
pEvent_info);
|
||||
break;
|
||||
#endif
|
||||
#endif
|
||||
default:
|
||||
/* Err msg */
|
||||
|
|
@ -2879,7 +2877,6 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac,
|
|||
return status;
|
||||
}
|
||||
|
||||
#if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
|
||||
/* This is a dummy function now. But the purpose of me adding this was to
|
||||
* delay the TSPEC processing till SET_KEY completes. This function can be
|
||||
* used to do any SME_QOS processing after the SET_KEY. As of now, it is
|
||||
|
|
@ -2894,7 +2891,6 @@ CDF_STATUS sme_qos_process_set_key_success_ind(tpAniSirGlobal pMac,
|
|||
(void)sme_qos_process_buffered_cmd(sessionId);
|
||||
return CDF_STATUS_SUCCESS;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in a new issue