mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-10 06:09:23 -04:00
qcacld-3.0: Remove WLAN_FEATURE_VOWIFI_11R option from SME
Conditional compilation option WLAN_FEATURE_VOWIFI_11R is always defined in cld3.0 and underlying code is permanent in the driver. Hence, remove #ifdef WLAN_FEATURE_VOWIFI_11R check from SME source code. CRs-Fixed: 960105 Change-Id: Ib42c92aaca69c04b98dd42b7aab2a552c88af24e
This commit is contained in:
Deepak Dhamdhere
Akash Patel
parent
9f09e75f87
commit
add334b14f
13 changed files with 54 additions and 235 deletions
|
|
@ -55,10 +55,8 @@ typedef enum {
|
|||
|
||||
eCSR_AUTH_TYPE_RSN,
|
||||
eCSR_AUTH_TYPE_RSN_PSK,
|
||||
#if defined WLAN_FEATURE_VOWIFI_11R
|
||||
eCSR_AUTH_TYPE_FT_RSN,
|
||||
eCSR_AUTH_TYPE_FT_RSN_PSK,
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_WAPI
|
||||
eCSR_AUTH_TYPE_WAPI_WAI_CERTIFICATE,
|
||||
eCSR_AUTH_TYPE_WAPI_WAI_PSK,
|
||||
|
|
@ -313,12 +311,10 @@ typedef struct tagCsrAuthList {
|
|||
eCsrAuthType authType[eCSR_NUM_OF_SUPPORT_AUTH_TYPE];
|
||||
} tCsrAuthList, *tpCsrAuthList;
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
typedef struct tagCsrMobilityDomainInfo {
|
||||
uint8_t mdiePresent;
|
||||
uint16_t mobilityDomain;
|
||||
} tCsrMobilityDomainInfo;
|
||||
#endif
|
||||
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
typedef struct tagCsrEseCckmInfo {
|
||||
|
|
@ -374,9 +370,7 @@ typedef struct tagCsrScanResultFilter {
|
|||
*/
|
||||
bool fMeasurement;
|
||||
#endif
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
tCsrMobilityDomainInfo MDID;
|
||||
#endif
|
||||
bool p2pResult;
|
||||
#ifdef WLAN_FEATURE_11W
|
||||
/* Management Frame Protection */
|
||||
|
|
@ -459,9 +453,7 @@ typedef enum {
|
|||
/* BSS in SoftAP mode status indication */
|
||||
eCSR_ROAM_INFRA_IND,
|
||||
eCSR_ROAM_WPS_PBC_PROBE_REQ_IND,
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
eCSR_ROAM_FT_RESPONSE,
|
||||
#endif
|
||||
eCSR_ROAM_FT_START,
|
||||
eCSR_ROAM_REMAIN_CHAN_READY,
|
||||
eCSR_ROAM_SEND_ACTION_CNF,
|
||||
|
|
@ -932,9 +924,7 @@ typedef struct tagCsrRoamProfile {
|
|||
bool obssProtEnabled;
|
||||
uint16_t cfg_protection;
|
||||
uint8_t wps_state;
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
tCsrMobilityDomainInfo MDID;
|
||||
#endif
|
||||
enum tCDF_ADAPTER_MODE csrPersona;
|
||||
uint8_t disableDFSChSwitch;
|
||||
/* addIe params */
|
||||
|
|
@ -991,9 +981,7 @@ typedef struct tagCsrRoamConnectedProfile {
|
|||
tSirBssDescription *pBssDesc;
|
||||
bool qap; /* AP supports QoS */
|
||||
bool qosConnection; /* A connection is QoS enabled */
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
tCsrMobilityDomainInfo MDID;
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
tCsrEseCckmInfo eseCckmInfo;
|
||||
bool isESEAssoc;
|
||||
|
|
@ -1011,11 +999,9 @@ typedef struct tagCsrRoamConnectedProfile {
|
|||
#endif
|
||||
} tCsrRoamConnectedProfile;
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
typedef struct tagCsr11rConfigParams {
|
||||
bool IsFTResourceReqSupported;
|
||||
} tCsr11rConfigParams;
|
||||
#endif
|
||||
|
||||
typedef struct tagCsrNeighborRoamConfigParams {
|
||||
|
||||
|
|
@ -1122,9 +1108,7 @@ typedef struct tagCsrConfigParam {
|
|||
uint32_t statsReqPeriodicity;
|
||||
/* stats request frequency from PE while in power save */
|
||||
uint32_t statsReqPeriodicityInPS;
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
tCsr11rConfigParams csr11rConfig;
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
uint8_t isEseIniFeatureEnabled;
|
||||
#endif
|
||||
|
|
@ -1590,10 +1574,8 @@ typedef void (*tCsrTsmStatsCallback)(tAniTrafStrmMetrics tsmMetrics,
|
|||
#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
|
||||
typedef void (*tCsrSnrCallback)(int8_t snr, uint32_t staId, void *pContext);
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
CDF_STATUS csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId,
|
||||
tpSirBssDescription pBssDescription);
|
||||
#endif
|
||||
CDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand);
|
||||
eCsrBand csr_get_current_band(tHalHandle hHal);
|
||||
typedef void (*csr_readyToSuspendCallback)(void *pContext, bool suspended);
|
||||
|
|
|
|||
|
|
@ -457,11 +457,9 @@ typedef struct tagCsrCmd {
|
|||
} u;
|
||||
} tCsrCmd;
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
typedef struct tagCsr11rConfig {
|
||||
bool IsFTResourceReqSupported;
|
||||
} tCsr11rConfig;
|
||||
#endif
|
||||
|
||||
typedef struct tagCsrNeighborRoamConfig {
|
||||
uint32_t nNeighborScanTimerPeriod;
|
||||
|
|
@ -564,9 +562,7 @@ typedef struct tagCsrConfig {
|
|||
uint32_t statsReqPeriodicityInPS;/* stats req freq while in powersave */
|
||||
uint32_t dtimPeriod;
|
||||
bool ssidHidden;
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
tCsr11rConfig csr11rConfig;
|
||||
#endif
|
||||
uint8_t isFastRoamIniFeatureEnabled;
|
||||
uint8_t MAWCEnabled;
|
||||
uint8_t isRoamOffloadScanEnabled;
|
||||
|
|
@ -771,10 +767,8 @@ typedef struct tagRoamCsrConnectedInfo {
|
|||
uint32_t nBeaconLength;
|
||||
uint32_t nAssocReqLength;
|
||||
uint32_t nAssocRspLength;
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
/* len of the parsed RIC resp IEs received in reassoc response */
|
||||
uint32_t nRICRspLength;
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
uint32_t nTspecIeLength;
|
||||
#endif
|
||||
|
|
@ -970,9 +964,7 @@ typedef struct tagCsrRoamSession {
|
|||
uint8_t RoamKeyMgmtOffloadEnabled;
|
||||
roam_offload_synch_ind *roam_synch_data;
|
||||
#endif
|
||||
#if defined WLAN_FEATURE_VOWIFI_11R
|
||||
tftSMEContext ftSmeContext;
|
||||
#endif
|
||||
/* This count represents the number of bssid's we try to join. */
|
||||
uint8_t join_bssid_count;
|
||||
struct csr_roam_stored_profile stored_roam_profile;
|
||||
|
|
@ -1304,10 +1296,8 @@ CDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac,
|
|||
pPrefNetworkFoundInd);
|
||||
#endif
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
/* Returns whether the current association is a 11r assoc or not */
|
||||
bool csr_roam_is11r_assoc(tpAniSirGlobal pMac, uint8_t sessionId);
|
||||
#endif
|
||||
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
/* Returns whether the current association is a ESE assoc or not */
|
||||
|
|
|
|||
|
|
@ -45,10 +45,8 @@ typedef enum {
|
|||
eCSR_NEIGHBOR_ROAM_STATE_INIT,
|
||||
eCSR_NEIGHBOR_ROAM_STATE_CONNECTED,
|
||||
eCSR_NEIGHBOR_ROAM_STATE_REASSOCIATING,
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
eCSR_NEIGHBOR_ROAM_STATE_PREAUTHENTICATING,
|
||||
eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE,
|
||||
#endif /* WLAN_FEATURE_VOWIFI_11R */
|
||||
eNEIGHBOR_STATE_MAX
|
||||
} eCsrNeighborRoamState;
|
||||
|
||||
|
|
@ -91,7 +89,6 @@ typedef struct sCsrNeighborRoamBSSInfo {
|
|||
tpSirBssDescription pBssDescription;
|
||||
} tCsrNeighborRoamBSSInfo, *tpCsrNeighborRoamBSSInfo;
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
#define CSR_NEIGHBOR_ROAM_REPORT_QUERY_TIMEOUT 1000 /* in milliseconds */
|
||||
#define CSR_NEIGHBOR_ROAM_PREAUTH_RSP_WAIT_MULTIPLIER 10 /* in milliseconds */
|
||||
/* Max number of MAC addresses with which the pre-auth was failed */
|
||||
|
|
@ -124,7 +121,6 @@ typedef struct sCsr11rAssocNeighborInfo {
|
|||
/* Contains info needed during REPORT_SCAN State */
|
||||
tCsrNeighborReportBssInfo neighboReportBssInfo[MAX_BSS_IN_NEIGHBOR_RPT];
|
||||
} tCsr11rAssocNeighborInfo, *tpCsr11rAssocNeighborInfo;
|
||||
#endif /* WLAN_FEATURE_VOWIFI_11R */
|
||||
|
||||
typedef enum {
|
||||
eFirstEmptyScan = 1,
|
||||
|
|
@ -153,10 +149,8 @@ typedef struct sCsrNeighborRoamControlInfo {
|
|||
uint8_t currentRoamRescanRssiDiff;
|
||||
tDblLinkList roamableAPList; /* List of current FT candidates */
|
||||
tCsrRoamProfile csrNeighborRoamProfile;
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
bool is11rAssoc;
|
||||
tCsr11rAssocNeighborInfo FTRoamInfo;
|
||||
#endif /* WLAN_FEATURE_VOWIFI_11R */
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
bool isESEAssoc;
|
||||
bool isVOAdmitted;
|
||||
|
|
@ -198,9 +192,7 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac,
|
|||
tpCsrNeighborRoamBSSInfo pHandoffNode, uint8_t sessionId);
|
||||
CDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal pMac,
|
||||
uint8_t sessionId, tSirRetStatus limStatus);
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
bool csr_neighbor_roam_is11r_assoc(tpAniSirGlobal pMac, uint8_t sessionId);
|
||||
#endif
|
||||
CDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(
|
||||
tpAniSirGlobal pMac, uint8_t sessionId);
|
||||
void csr_neighbor_roam_tranistion_preauth_done_to_disconnected(
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2011-2015 The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
|
||||
*
|
||||
|
|
@ -361,10 +361,8 @@ CDF_STATUS csr_isconcurrentsession_valid(tpAniSirGlobal pMac,
|
|||
CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, uint8_t channelId,
|
||||
uint16_t *beaconInterval, uint32_t cursessionId,
|
||||
enum tCDF_ADAPTER_MODE currBssPersona);
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
bool csr_is_profile11r(tCsrRoamProfile *pProfile);
|
||||
bool csr_is_auth_type11r(eCsrAuthType AuthType, uint8_t mdiePresent);
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
bool csr_is_auth_type_ese(eCsrAuthType AuthType);
|
||||
bool csr_is_profile_ese(tCsrRoamProfile *pProfile);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2013-2015 The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2013-2016 The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
|
||||
*
|
||||
|
|
@ -24,7 +24,6 @@
|
|||
* under proprietary terms before Copyright ownership was assigned
|
||||
* to the Linux Foundation.
|
||||
*/
|
||||
#if defined(WLAN_FEATURE_VOWIFI_11R)
|
||||
|
||||
#if !defined(__SME_FTAPI_H)
|
||||
#define __SME_FTAPI_H
|
||||
|
|
@ -103,5 +102,3 @@ bool sme_get_ft_pre_auth_state(tHalHandle hHal, uint32_t sessionId);
|
|||
bool sme_get_ftptk_state(tHalHandle hHal, uint32_t sessionId);
|
||||
void sme_set_ftptk_state(tHalHandle hHal, uint32_t sessionId, bool state);
|
||||
#endif
|
||||
|
||||
#endif /* #if !defined( __SME_FTAPI_H ) */
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2014-2015 The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2014-2016 The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
|
||||
*
|
||||
|
|
@ -79,10 +79,8 @@ typedef enum {
|
|||
SME_QOS_CSR_HANDOFF_ASSOC_REQ,
|
||||
SME_QOS_CSR_HANDOFF_COMPLETE,
|
||||
SME_QOS_CSR_HANDOFF_FAILURE,
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
SME_QOS_CSR_PREAUTH_SUCCESS_IND,
|
||||
SME_QOS_CSR_SET_KEY_SUCCESS_IND,
|
||||
#endif
|
||||
} sme_qos_csr_event_indType;
|
||||
|
||||
#ifdef FEATURE_WLAN_DIAG_SUPPORT
|
||||
|
|
|
|||
|
|
@ -2195,9 +2195,7 @@ CDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg)
|
|||
case eWNI_SME_ADDTS_RSP:
|
||||
case eWNI_SME_DELTS_RSP:
|
||||
case eWNI_SME_DELTS_IND:
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
case eWNI_SME_FT_AGGR_QOS_RSP:
|
||||
#endif
|
||||
/* QoS */
|
||||
if (pMsg->bodyptr) {
|
||||
#ifndef WLAN_MDM_CODE_REDUCTION_OPT
|
||||
|
|
@ -9559,12 +9557,8 @@ bool sme_get_is_lfr_feature_enabled(tHalHandle hHal)
|
|||
--------------------------------------------------------------------------*/
|
||||
bool sme_get_is_ft_feature_enabled(tHalHandle hHal)
|
||||
{
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
|
||||
return pMac->roam.configParam.isFastTransitionEnabled;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
/* ---------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -25,16 +25,6 @@
|
|||
* to the Linux Foundation.
|
||||
*/
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
/**=========================================================================
|
||||
|
||||
\brief Definitions for SME FT APIs
|
||||
|
||||
========================================================================*/
|
||||
|
||||
/*--------------------------------------------------------------------------
|
||||
Include Files
|
||||
------------------------------------------------------------------------*/
|
||||
#include <sms_debug.h>
|
||||
#include <csr_inside_api.h>
|
||||
#include <csr_neighbor_roam.h>
|
||||
|
|
@ -600,4 +590,3 @@ void sme_ft_reset(tHalHandle hHal, uint32_t sessionId)
|
|||
}
|
||||
|
||||
/* End of File */
|
||||
#endif /* WLAN_FEATURE_VOWIFI_11R */
|
||||
|
|
|
|||
|
|
@ -1023,7 +1023,6 @@ CDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal pMac,
|
|||
sizeof(struct cdf_mac_addr));
|
||||
cdf_mem_copy(&pProfile->SSID, &connected_prof->SSID,
|
||||
sizeof(tSirMacSSid));
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
if (connected_prof->MDID.mdiePresent) {
|
||||
pProfile->MDID.mdiePresent = 1;
|
||||
pProfile->MDID.mobilityDomain =
|
||||
|
|
@ -1032,7 +1031,6 @@ CDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal pMac,
|
|||
pProfile->MDID.mdiePresent = 0;
|
||||
pProfile->MDID.mobilityDomain = 0;
|
||||
}
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
pProfile->isESEAssoc = connected_prof->isESEAssoc;
|
||||
if (csr_is_auth_type_ese(connected_prof->AuthType)) {
|
||||
|
|
@ -1098,9 +1096,7 @@ static CDF_STATUS csr_roam_free_connected_info(tpAniSirGlobal pMac,
|
|||
pConnectedInfo->nAssocReqLength = 0;
|
||||
pConnectedInfo->nAssocRspLength = 0;
|
||||
pConnectedInfo->staId = 0;
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
pConnectedInfo->nRICRspLength = 0;
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
pConnectedInfo->nTspecIeLength = 0;
|
||||
#endif
|
||||
|
|
@ -1337,9 +1333,7 @@ static void init_config_param(tpAniSirGlobal pMac)
|
|||
CSR_MIN_GLOBAL_STAT_QUERY_PERIOD;
|
||||
pMac->roam.configParam.statsReqPeriodicityInPS =
|
||||
CSR_MIN_GLOBAL_STAT_QUERY_PERIOD_IN_BMPS;
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
pMac->roam.configParam.csr11rConfig.IsFTResourceReqSupported = 0;
|
||||
#endif
|
||||
pMac->roam.configParam.neighborRoamConfig.nMaxNeighborRetries = 3;
|
||||
pMac->roam.configParam.neighborRoamConfig.nNeighborLookupRssiThreshold =
|
||||
120;
|
||||
|
|
@ -1917,14 +1911,12 @@ CDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac,
|
|||
csr_init_channel_power_list(pMac, &pParam->Csr11dinfo);
|
||||
}
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
cdf_mem_copy(&pMac->roam.configParam.csr11rConfig,
|
||||
&pParam->csr11rConfig,
|
||||
sizeof(tCsr11rConfigParams));
|
||||
sms_log(pMac, LOG1, "IsFTResourceReqSupp = %d",
|
||||
pMac->roam.configParam.csr11rConfig.
|
||||
IsFTResourceReqSupported);
|
||||
#endif
|
||||
pMac->roam.configParam.isFastTransitionEnabled =
|
||||
pParam->isFastTransitionEnabled;
|
||||
pMac->roam.configParam.RoamRssiDiff = pParam->RoamRssiDiff;
|
||||
|
|
@ -2199,10 +2191,8 @@ CDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam)
|
|||
pParam->ignore_peer_erp_info = cfg_params->ignore_peer_erp_info;
|
||||
pParam->enable2x2 = cfg_params->enable2x2;
|
||||
#endif
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
cdf_mem_copy(&cfg_params->csr11rConfig, &pParam->csr11rConfig,
|
||||
sizeof(tCsr11rConfigParams));
|
||||
#endif
|
||||
pParam->isFastTransitionEnabled = cfg_params->isFastTransitionEnabled;
|
||||
pParam->RoamRssiDiff = cfg_params->RoamRssiDiff;
|
||||
pParam->nRoamPrefer5GHz = cfg_params->nRoamPrefer5GHz;
|
||||
|
|
@ -3057,7 +3047,6 @@ CDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId,
|
|||
} else {
|
||||
reasonCode = eSIR_MAC_UNSPEC_FAILURE_REASON;
|
||||
}
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
if ((csr_roam_is_handoff_in_progress(pMac, sessionId)) &&
|
||||
(NewSubstate != eCSR_ROAM_SUBSTATE_DISASSOC_HANDOFF)) {
|
||||
tpCsrNeighborRoamControlInfo pNeighborRoamInfo =
|
||||
|
|
@ -3065,9 +3054,7 @@ CDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId,
|
|||
cdf_copy_macaddr(&bssId,
|
||||
pNeighborRoamInfo->csrNeighborRoamProfile.BSSIDs.
|
||||
bssid);
|
||||
} else
|
||||
#endif
|
||||
if (pSession->pConnectBssDesc) {
|
||||
} else if (pSession->pConnectBssDesc) {
|
||||
cdf_mem_copy(&bssId.bytes, pSession->pConnectBssDesc->bssId,
|
||||
sizeof(struct cdf_mac_addr));
|
||||
}
|
||||
|
|
@ -5346,10 +5333,8 @@ static CDF_STATUS csr_roam_save_params(tpAniSirGlobal mac_ctx,
|
|||
uint8_t *pIeBuf;
|
||||
|
||||
if ((eCSR_AUTH_TYPE_RSN == auth_type) ||
|
||||
#if defined WLAN_FEATURE_VOWIFI_11R
|
||||
(eCSR_AUTH_TYPE_FT_RSN == auth_type) ||
|
||||
(eCSR_AUTH_TYPE_FT_RSN_PSK == auth_type) ||
|
||||
#endif /* WLAN_FEATURE_VOWIFI_11R */
|
||||
#if defined WLAN_FEATURE_11W
|
||||
(eCSR_AUTH_TYPE_RSN_PSK_SHA256 == auth_type) ||
|
||||
(eCSR_AUTH_TYPE_RSN_8021X_SHA256 == auth_type) ||
|
||||
|
|
@ -5529,10 +5514,8 @@ static CDF_STATUS csr_roam_save_security_rsp_ie(tpAniSirGlobal pMac,
|
|||
(eCSR_AUTH_TYPE_WPA_PSK == authType) ||
|
||||
(eCSR_AUTH_TYPE_RSN == authType) ||
|
||||
(eCSR_AUTH_TYPE_RSN_PSK == authType)
|
||||
#if defined WLAN_FEATURE_VOWIFI_11R
|
||||
|| (eCSR_AUTH_TYPE_FT_RSN == authType) ||
|
||||
(eCSR_AUTH_TYPE_FT_RSN_PSK == authType)
|
||||
#endif /* FEATURE_WLAN_WAPI */
|
||||
#ifdef FEATURE_WLAN_WAPI
|
||||
|| (eCSR_AUTH_TYPE_WAPI_WAI_PSK == authType) ||
|
||||
(eCSR_AUTH_TYPE_WAPI_WAI_CERTIFICATE == authType)
|
||||
|
|
@ -5557,13 +5540,12 @@ static CDF_STATUS csr_roam_save_security_rsp_ie(tpAniSirGlobal pMac,
|
|||
return status;
|
||||
}
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
/* Returns whether the current association is a 11r assoc or not */
|
||||
bool csr_roam_is11r_assoc(tpAniSirGlobal pMac, uint8_t sessionId)
|
||||
{
|
||||
return csr_neighbor_roam_is11r_assoc(pMac, sessionId);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
/* Returns whether the current association is a ESE assoc or not */
|
||||
bool csr_roam_is_ese_assoc(tpAniSirGlobal pMac, uint8_t sessionId)
|
||||
|
|
@ -6346,9 +6328,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx,
|
|||
len = join_rsp->assocReqLength +
|
||||
join_rsp->assocRspLength +
|
||||
join_rsp->beaconLength;
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
len += join_rsp->parsedRicRspLen;
|
||||
#endif /* WLAN_FEATURE_VOWIFI_11R */
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
len += join_rsp->tspecIeLen;
|
||||
#endif
|
||||
|
|
@ -6366,10 +6346,8 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx,
|
|||
join_rsp->assocRspLength;
|
||||
session->connectedInfo.nBeaconLength =
|
||||
join_rsp->beaconLength;
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
session->connectedInfo.nRICRspLength =
|
||||
join_rsp->parsedRicRspLen;
|
||||
#endif /* WLAN_FEATURE_VOWIFI_11R */
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
session->connectedInfo.nTspecIeLength =
|
||||
join_rsp->tspecIeLen;
|
||||
|
|
@ -6847,13 +6825,11 @@ CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac,
|
|||
pDstProfile->MFPRequired = pSrcProfile->MFPRequired;
|
||||
pDstProfile->MFPCapable = pSrcProfile->MFPCapable;
|
||||
#endif
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
if (pSrcProfile->MDID.mdiePresent) {
|
||||
pDstProfile->MDID.mdiePresent = 1;
|
||||
pDstProfile->MDID.mobilityDomain =
|
||||
pSrcProfile->MDID.mobilityDomain;
|
||||
}
|
||||
#endif
|
||||
cdf_mem_copy(&pDstProfile->addIeParams, &pSrcProfile->addIeParams,
|
||||
sizeof(tSirAddIeParams));
|
||||
end:
|
||||
|
|
@ -6942,13 +6918,11 @@ CDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac,
|
|||
pDstProfile->CBMode = pSrcProfile->CBMode;
|
||||
cdf_mem_copy(&pDstProfile->Keys, &pSrcProfile->Keys,
|
||||
sizeof(pDstProfile->Keys));
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
if (pSrcProfile->MDID.mdiePresent) {
|
||||
pDstProfile->MDID.mdiePresent = 1;
|
||||
pDstProfile->MDID.mobilityDomain =
|
||||
pSrcProfile->MDID.mobilityDomain;
|
||||
}
|
||||
#endif
|
||||
#ifdef WLAN_FEATURE_11W
|
||||
pDstProfile->MFPEnabled = pSrcProfile->MFPEnabled;
|
||||
pDstProfile->MFPRequired = pSrcProfile->MFPRequired;
|
||||
|
|
@ -7592,14 +7566,12 @@ CDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal pMac, tSmeCmd *pComma
|
|||
* then go to disconnected state.
|
||||
* This happens for ESE and 11r FT connections ONLY.
|
||||
*/
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
if (csr_roam_is11r_assoc(pMac, sessionId) &&
|
||||
(csr_neighbor_roam_state_preauth_done(pMac,
|
||||
sessionId))) {
|
||||
csr_neighbor_roam_tranistion_preauth_done_to_disconnected(
|
||||
pMac, sessionId);
|
||||
}
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
if (csr_roam_is_ese_assoc(pMac, sessionId) &&
|
||||
(csr_neighbor_roam_state_preauth_done(pMac,
|
||||
|
|
@ -7896,13 +7868,11 @@ CDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac,
|
|||
sms_log(pMac, LOGW, FL("ERROR: Beacon interval is ZERO"));
|
||||
}
|
||||
csr_get_bss_id_bss_desc(pMac, pSirBssDesc, &pConnectProfile->bssid);
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
if (pSirBssDesc->mdiePresent) {
|
||||
pConnectProfile->MDID.mdiePresent = 1;
|
||||
pConnectProfile->MDID.mobilityDomain =
|
||||
(pSirBssDesc->mdie[1] << 8) | (pSirBssDesc->mdie[0]);
|
||||
}
|
||||
#endif
|
||||
if (NULL == pIesTemp) {
|
||||
status =
|
||||
csr_get_parsed_bss_description_ies(pMac, pSirBssDesc,
|
||||
|
|
@ -8515,7 +8485,6 @@ csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx,
|
|||
* will be used only for ESE and 11r handoff whereas other
|
||||
* legacy roaming should use join request
|
||||
*/
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
if (csr_roam_is_handoff_in_progress(mac_ctx, session_id)
|
||||
&& csr_roam_is11r_assoc(mac_ctx, session_id)) {
|
||||
status = csr_roam_issue_reassociate(mac_ctx,
|
||||
|
|
@ -8524,7 +8493,6 @@ csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx,
|
|||
(scan_result->Result.pvIes),
|
||||
&cmd->u.roamCmd.roamProfile);
|
||||
} else
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
if (csr_roam_is_handoff_in_progress(mac_ctx, session_id)
|
||||
&& csr_roam_is_ese_assoc(mac_ctx, session_id)) {
|
||||
|
|
@ -9734,12 +9702,10 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx,
|
|||
cdf_mem_copy(scan_fltr->countryCode, profile->countryCode,
|
||||
WNI_CFG_COUNTRY_CODE_LEN);
|
||||
}
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
if (profile->MDID.mdiePresent) {
|
||||
scan_fltr->MDID.mdiePresent = 1;
|
||||
scan_fltr->MDID.mobilityDomain = profile->MDID.mobilityDomain;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef WLAN_FEATURE_11W
|
||||
/* Management Frame Protection */
|
||||
|
|
@ -10112,12 +10078,10 @@ csr_roam_chk_lnk_disassoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr)
|
|||
* from current ap and then go to disconnected state
|
||||
* This happens for ESE and 11r FT connections ONLY.
|
||||
*/
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
if (csr_roam_is11r_assoc(mac_ctx, sessionId) &&
|
||||
(csr_neighbor_roam_state_preauth_done(mac_ctx, sessionId)))
|
||||
csr_neighbor_roam_tranistion_preauth_done_to_disconnected(
|
||||
mac_ctx, sessionId);
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
if (csr_roam_is_ese_assoc(mac_ctx, sessionId) &&
|
||||
(csr_neighbor_roam_state_preauth_done(mac_ctx, sessionId)))
|
||||
|
|
@ -10194,12 +10158,10 @@ csr_roam_chk_lnk_deauth_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr)
|
|||
* from current ap and then go to disconnected state
|
||||
* This happens for ESE and 11r FT connections ONLY.
|
||||
*/
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
if (csr_roam_is11r_assoc(mac_ctx, sessionId) &&
|
||||
(csr_neighbor_roam_state_preauth_done(mac_ctx, sessionId)))
|
||||
csr_neighbor_roam_tranistion_preauth_done_to_disconnected(
|
||||
mac_ctx, sessionId);
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
if (csr_roam_is_ese_assoc(mac_ctx, sessionId) &&
|
||||
(csr_neighbor_roam_state_preauth_done(mac_ctx, sessionId)))
|
||||
|
|
@ -10964,11 +10926,9 @@ void csr_roam_check_for_link_status_change(tpAniSirGlobal pMac, tSirSmeRsp *pSir
|
|||
sms_log(pMac, LOG2, FL("GetSnrReq from self"));
|
||||
csr_update_snr(pMac, pSirMsg);
|
||||
break;
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
case eWNI_SME_FT_PRE_AUTH_RSP:
|
||||
csr_roam_ft_pre_auth_rsp_processor(pMac, (tpSirFTPreAuthRsp) pSirMsg);
|
||||
break;
|
||||
#endif
|
||||
case eWNI_SME_MAX_ASSOC_EXCEEDED:
|
||||
csr_roam_chk_lnk_max_assoc_exceeded(pMac, pSirMsg);
|
||||
break;
|
||||
|
|
@ -12124,7 +12084,6 @@ bool csr_is_same_profile(tpAniSirGlobal pMac,
|
|||
fCheck = false;
|
||||
goto free_scan_filter;
|
||||
}
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
if (pProfile1->MDID.mdiePresent || pProfile2->MDID.mdiePresent) {
|
||||
if (pProfile1->MDID.mobilityDomain
|
||||
!= pProfile2->MDID.mobilityDomain) {
|
||||
|
|
@ -12132,7 +12091,6 @@ bool csr_is_same_profile(tpAniSirGlobal pMac,
|
|||
goto free_scan_filter;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
/* Match found */
|
||||
fCheck = true;
|
||||
free_scan_filter:
|
||||
|
|
@ -13749,7 +13707,6 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
|
|||
#ifdef FEATURE_WLAN_ESE
|
||||
ese_config = pMac->roam.configParam.isEseIniFeatureEnabled;
|
||||
#endif
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
pProfile->MDID.mdiePresent = pBssDescription->mdiePresent;
|
||||
if (csr_is_profile11r(pProfile)
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
|
|
@ -13762,7 +13719,6 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
|
|||
csr_join_req->is11Rconnection = true;
|
||||
else
|
||||
csr_join_req->is11Rconnection = false;
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
if (true == ese_config)
|
||||
csr_join_req->isESEFeatureIniEnabled = true;
|
||||
|
|
@ -14076,10 +14032,7 @@ CDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
|
|||
* to the AP
|
||||
*/
|
||||
if (CSR_IS_ROAM_SUBSTATE_DISASSOC_HO(pMac, sessionId)
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
&& csr_roam_is11r_assoc(pMac, sessionId)
|
||||
#endif
|
||||
) {
|
||||
&& csr_roam_is11r_assoc(pMac, sessionId)) {
|
||||
/* Set DoNotSendOverTheAir flag to 1 only for handoff case */
|
||||
pMsg->doNotSendOverTheAir = CSR_DONT_SEND_DISASSOC_OVER_THE_AIR;
|
||||
}
|
||||
|
|
@ -14872,10 +14825,8 @@ CDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac,
|
|||
pSession->sessionActive = true;
|
||||
pSession->sessionId = (uint8_t) i;
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
/* Initialize FT related data structures only in STA mode */
|
||||
sme_ft_open(pMac, pSession->sessionId);
|
||||
#endif
|
||||
|
||||
pSession->callback = callback;
|
||||
pSession->pContext = pContext;
|
||||
|
|
@ -15095,9 +15046,7 @@ void csr_cleanup_session(tpAniSirGlobal pMac, uint32_t sessionId)
|
|||
csr_roam_stop(pMac, sessionId);
|
||||
|
||||
/* Clean up FT related data structures */
|
||||
#if defined WLAN_FEATURE_VOWIFI_11R
|
||||
sme_ft_close(pMac, sessionId);
|
||||
#endif
|
||||
csr_free_connect_bss_desc(pMac, sessionId);
|
||||
csr_roam_free_connect_profile(&pSession->connectedProfile);
|
||||
csr_roam_free_connected_info(pMac, &pSession->connectedInfo);
|
||||
|
|
@ -15289,10 +15238,7 @@ static void csr_roam_link_down(tpAniSirGlobal pMac, uint32_t sessionId)
|
|||
*/
|
||||
if (csr_roam_is_sta_mode(pMac, sessionId)
|
||||
&& !CSR_IS_ROAM_SUBSTATE_DISASSOC_HO(pMac, sessionId)
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
&& !csr_roam_is11r_assoc(pMac, sessionId)
|
||||
#endif
|
||||
) {
|
||||
&& !csr_roam_is11r_assoc(pMac, sessionId)) {
|
||||
sms_log(pMac, LOG1, FL("Inform Link lost for session %d"),
|
||||
sessionId);
|
||||
csr_roam_call_callback(pMac, sessionId, NULL, 0,
|
||||
|
|
@ -17669,7 +17615,6 @@ CDF_STATUS csr_roam_update_wparsni_es(tpAniSirGlobal pMac, uint32_t sessionId,
|
|||
return status;
|
||||
}
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
CDF_STATUS
|
||||
csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId,
|
||||
tpSirBssDescription pBssDescription)
|
||||
|
|
@ -17718,7 +17663,6 @@ csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId,
|
|||
cdf_mem_copy((void *)&pftPreAuthReq->self_mac_addr,
|
||||
(void *)&pSession->selfMacAddr.bytes, sizeof(tSirMacAddr));
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
if (csr_roam_is11r_assoc(pMac, sessionId) &&
|
||||
(pMac->roam.roamSession[sessionId].connectedProfile.AuthType !=
|
||||
eCSR_AUTH_TYPE_OPEN_SYSTEM)) {
|
||||
|
|
@ -17727,9 +17671,7 @@ csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId,
|
|||
cdf_mem_copy(pftPreAuthReq->ft_ies,
|
||||
pSession->ftSmeContext.auth_ft_ies,
|
||||
pSession->ftSmeContext.auth_ft_ies_length);
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
} else {
|
||||
pftPreAuthReq->ft_ies_length = 0;
|
||||
}
|
||||
cdf_mem_copy(pftPreAuthReq->pbssDescription, pBssDescription,
|
||||
|
|
@ -17878,7 +17820,6 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal,
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -997,15 +997,12 @@ CDF_STATUS csr_send_mb_get_wpspbc_sessions(tpAniSirGlobal pMac,
|
|||
CDF_STATUS
|
||||
csr_send_chng_mcc_beacon_interval(tpAniSirGlobal pMac, uint32_t sessionId);
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
/* ---------------------------------------------------------------------------
|
||||
\fn csr_roam_ft_pre_auth_rsp_processor
|
||||
\brief csr function that handles pre auth response from LIM
|
||||
---------------------------------------------------------------------------*/
|
||||
void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal,
|
||||
tpSirFTPreAuthRsp pFTPreAuthRsp);
|
||||
#endif
|
||||
|
||||
|
||||
#if defined(FEATURE_WLAN_ESE)
|
||||
void update_cckmtsf(uint32_t *timeStamp0, uint32_t *timeStamp1,
|
||||
|
|
|
|||
|
|
@ -58,10 +58,8 @@ static void csr_neighbor_roam_reset_preauth_control_info(tpAniSirGlobal pMac,
|
|||
CDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, uint32_t sessionId,
|
||||
tCsrRoamProfile *pDstProfile);
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
static CDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal pMac,
|
||||
uint8_t sessionId);
|
||||
#endif
|
||||
|
||||
#define CSR_NEIGHBOR_ROAM_STATE_TRANSITION(mac_ctx, newstate, session) \
|
||||
{ \
|
||||
|
|
@ -646,7 +644,6 @@ static void csr_neighbor_roam_reset_preauth_control_info(tpAniSirGlobal pMac,
|
|||
|
||||
pNeighborRoamInfo->FTRoamInfo.preauthRspPending = false;
|
||||
pNeighborRoamInfo->FTRoamInfo.numPreAuthRetries = 0;
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
/* Do not free up the preauth done list here */
|
||||
pNeighborRoamInfo->FTRoamInfo.currentNeighborRptRetryNum = 0;
|
||||
pNeighborRoamInfo->FTRoamInfo.neighborRptPending = false;
|
||||
|
|
@ -654,7 +651,6 @@ static void csr_neighbor_roam_reset_preauth_control_info(tpAniSirGlobal pMac,
|
|||
cdf_mem_zero(pNeighborRoamInfo->FTRoamInfo.neighboReportBssInfo,
|
||||
sizeof(tCsrNeighborReportBssInfo) *
|
||||
MAX_BSS_IN_NEIGHBOR_RPT);
|
||||
#endif
|
||||
pNeighborRoamInfo->uOsRequestedHandoff = 0;
|
||||
cdf_mem_zero(&pNeighborRoamInfo->handoffReqInfo,
|
||||
sizeof(tCsrHandoffRequest));
|
||||
|
|
@ -682,7 +678,6 @@ void csr_neighbor_roam_reset_connected_state_control_info(tpAniSirGlobal pMac,
|
|||
csr_neighbor_roam_free_roamable_bss_list(pMac,
|
||||
&pNeighborRoamInfo->roamableAPList);
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
/* Do not free up the preauth done list here */
|
||||
pNeighborRoamInfo->FTRoamInfo.currentNeighborRptRetryNum = 0;
|
||||
pNeighborRoamInfo->FTRoamInfo.neighborRptPending = false;
|
||||
|
|
@ -692,7 +687,6 @@ void csr_neighbor_roam_reset_connected_state_control_info(tpAniSirGlobal pMac,
|
|||
cdf_mem_zero(pNeighborRoamInfo->FTRoamInfo.neighboReportBssInfo,
|
||||
sizeof(tCsrNeighborReportBssInfo) *
|
||||
MAX_BSS_IN_NEIGHBOR_RPT);
|
||||
#endif
|
||||
pNeighborRoamInfo->uOsRequestedHandoff = 0;
|
||||
cdf_mem_zero(&pNeighborRoamInfo->handoffReqInfo,
|
||||
sizeof(tCsrHandoffRequest));
|
||||
|
|
@ -739,7 +733,6 @@ void csr_neighbor_roam_reset_init_state_control_info(tpAniSirGlobal pMac,
|
|||
csr_neighbor_roam_reset_report_scan_state_control_info(pMac, sessionId);
|
||||
}
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
/* ---------------------------------------------------------------------------
|
||||
|
||||
\fn csr_neighbor_roam_purge_preauth_fail_list
|
||||
|
|
@ -1120,7 +1113,6 @@ DEQ_PREAUTH:
|
|||
csr_dequeue_roam_command(mac_ctx, eCsrPerformPreauth);
|
||||
return preauth_processed;
|
||||
}
|
||||
#endif /* WLAN_FEATURE_VOWIFI_11R */
|
||||
|
||||
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
|
||||
/**
|
||||
|
|
@ -1328,7 +1320,6 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac,
|
|||
pScanFilter->ChannelInfo.ChannelList = NULL;
|
||||
}
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
if (nbr_roam_info->is11rAssoc) {
|
||||
/*
|
||||
* MDIE should be added as a part of profile. This should be
|
||||
|
|
@ -1338,7 +1329,6 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac,
|
|||
pScanFilter->MDID.mobilityDomain =
|
||||
pCurProfile->MDID.mobilityDomain;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef WLAN_FEATURE_11W
|
||||
pScanFilter->MFPEnabled = pCurProfile->MFPEnabled;
|
||||
|
|
@ -1490,7 +1480,6 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
|
|||
continue;
|
||||
}
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
if ((n_roam_info->is11rAssoc) &&
|
||||
(!csr_neighbor_roam_is_preauth_candidate(mac_ctx,
|
||||
sessionid, descr->bssId))) {
|
||||
|
|
@ -1498,7 +1487,6 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
|
|||
FL("BSSID present in pre-auth fail list.. Ignoring"));
|
||||
continue;
|
||||
}
|
||||
#endif /* WLAN_FEATURE_VOWIFI_11R */
|
||||
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
if (!csr_roam_is_roam_offload_scan_enabled(mac_ctx) &&
|
||||
|
|
@ -1683,7 +1671,7 @@ static CDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac,
|
|||
}
|
||||
|
||||
|
||||
#if defined WLAN_FEATURE_VOWIFI_11R && defined WLAN_FEATURE_VOWIFI
|
||||
#if defined WLAN_FEATURE_VOWIFI
|
||||
/**
|
||||
* csr_neighbor_roam_channels_filter_by_current_band()
|
||||
*
|
||||
|
|
@ -2006,7 +1994,7 @@ CDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGloba
|
|||
|
||||
return CDF_STATUS_SUCCESS;
|
||||
}
|
||||
#endif /* WLAN_FEATURE_VOWIFI_11R */
|
||||
#endif /* WLAN_FEATURE_VOWIFI */
|
||||
|
||||
/**
|
||||
* csr_neighbor_roam_is_ssid_and_security_match() - to match ssid/security
|
||||
|
|
@ -2427,7 +2415,6 @@ static void csr_neighbor_roam_info_ctx_init(
|
|||
csr_neighbor_roam_free_roamable_bss_list(pMac,
|
||||
&ngbr_roam_info->FTRoamInfo.preAuthDoneList);
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
/* Based on the auth scheme tell if we are 11r */
|
||||
if (csr_is_auth_type11r
|
||||
(session->connectedProfile.AuthType,
|
||||
|
|
@ -2439,7 +2426,6 @@ static void csr_neighbor_roam_info_ctx_init(
|
|||
ngbr_roam_info->is11rAssoc = false;
|
||||
NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("11rAssoc is = %d"),
|
||||
ngbr_roam_info->is11rAssoc);
|
||||
#endif
|
||||
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
/* Based on the auth scheme tell if we are 11r */
|
||||
|
|
@ -2607,7 +2593,6 @@ CDF_STATUS csr_neighbor_roam_indicate_connect(
|
|||
return status;
|
||||
}
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
/* ---------------------------------------------------------------------------
|
||||
|
||||
\fn csr_neighbor_roam_purge_preauth_failed_list
|
||||
|
|
@ -2689,7 +2674,6 @@ CDF_STATUS csr_neighbor_roam_init11r_assoc_info(tpAniSirGlobal pMac)
|
|||
}
|
||||
return status;
|
||||
}
|
||||
#endif /* WLAN_FEATURE_VOWIFI_11R */
|
||||
|
||||
/* ---------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -2813,7 +2797,6 @@ CDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId)
|
|||
NULL;
|
||||
pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = false;
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
status = csr_neighbor_roam_init11r_assoc_info(pMac);
|
||||
if (CDF_STATUS_SUCCESS != status) {
|
||||
sms_log(pMac, LOGE, FL("LL Open of roam able AP List failed"));
|
||||
|
|
@ -2823,7 +2806,6 @@ CDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId)
|
|||
csr_ll_close(&pNeighborRoamInfo->roamableAPList);
|
||||
return CDF_STATUS_E_RESOURCES;
|
||||
}
|
||||
#endif
|
||||
|
||||
CSR_NEIGHBOR_ROAM_STATE_TRANSITION(pMac, eCSR_NEIGHBOR_ROAM_STATE_INIT,
|
||||
sessionId)
|
||||
|
|
@ -2886,7 +2868,6 @@ void csr_neighbor_roam_close(tpAniSirGlobal pMac, uint8_t sessionId)
|
|||
/* Free the profile.. */
|
||||
csr_release_profile(pMac, &pNeighborRoamInfo->csrNeighborRoamProfile);
|
||||
csr_roam_free_connect_profile(&pNeighborRoamInfo->prevConnProfile);
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
pNeighborRoamInfo->FTRoamInfo.currentNeighborRptRetryNum = 0;
|
||||
pNeighborRoamInfo->FTRoamInfo.numBssFromNeighborReport = 0;
|
||||
cdf_mem_zero(pNeighborRoamInfo->FTRoamInfo.neighboReportBssInfo,
|
||||
|
|
@ -2896,7 +2877,6 @@ void csr_neighbor_roam_close(tpAniSirGlobal pMac, uint8_t sessionId)
|
|||
&pNeighborRoamInfo->FTRoamInfo.
|
||||
preAuthDoneList);
|
||||
csr_ll_close(&pNeighborRoamInfo->FTRoamInfo.preAuthDoneList);
|
||||
#endif /* WLAN_FEATURE_VOWIFI_11R */
|
||||
|
||||
CSR_NEIGHBOR_ROAM_STATE_TRANSITION(pMac,
|
||||
eCSR_NEIGHBOR_ROAM_STATE_CLOSED, sessionId)
|
||||
|
|
@ -3022,24 +3002,17 @@ bool csr_neighbor_roam_is_handoff_in_progress(tpAniSirGlobal pMac, uint8_t sessi
|
|||
|
||||
return false;
|
||||
}
|
||||
|
||||
#if defined(WLAN_FEATURE_VOWIFI_11R)
|
||||
/* ---------------------------------------------------------------------------
|
||||
|
||||
\fn csr_neighbor_roam_is11r_assoc
|
||||
|
||||
\brief This function returns whether the current association is a 11r assoc or not
|
||||
|
||||
\param pMac - The handle returned by mac_open.
|
||||
|
||||
\return true if current assoc is 11r, false otherwise
|
||||
|
||||
---------------------------------------------------------------------------*/
|
||||
bool csr_neighbor_roam_is11r_assoc(tpAniSirGlobal pMac, uint8_t sessionId)
|
||||
/**
|
||||
* csr_neighbor_roam_is11r_assoc() - Check if association type is 11R
|
||||
* @mac_ctx: MAC Global context
|
||||
* @session_id: Session ID
|
||||
*
|
||||
* Return: true if 11r Association, false otherwise.
|
||||
*/
|
||||
bool csr_neighbor_roam_is11r_assoc(tpAniSirGlobal mac_ctx, uint8_t session_id)
|
||||
{
|
||||
return pMac->roam.neighborRoamInfo[sessionId].is11rAssoc;
|
||||
return mac_ctx->roam.neighborRoamInfo[session_id].is11rAssoc;
|
||||
}
|
||||
#endif /* WLAN_FEATURE_VOWIFI_11R */
|
||||
|
||||
/**
|
||||
* csr_neighbor_roam_get_handoff_ap_info - Identifies the best AP for roaming
|
||||
|
|
@ -3067,7 +3040,6 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac,
|
|||
CDF_ASSERT(NULL != hand_off_node);
|
||||
return false;
|
||||
}
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
if (ngbr_roam_info->is11rAssoc) {
|
||||
/* Always the BSS info in the head is the handoff candidate */
|
||||
bss_node = csr_neighbor_roam_next_roamable_ap(
|
||||
|
|
@ -3079,7 +3051,6 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac,
|
|||
csr_ll_count(&
|
||||
ngbr_roam_info->FTRoamInfo.preAuthDoneList));
|
||||
} else
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
if (ngbr_roam_info->isESEAssoc) {
|
||||
/* Always the BSS info in the head is the handoff candidate */
|
||||
|
|
|
|||
|
|
@ -198,9 +198,7 @@ const char *get_e_roam_cmd_status_str(eRoamCmdStatus val)
|
|||
CASE_RETURN_STR(eCSR_ROAM_IBSS_LEAVE);
|
||||
CASE_RETURN_STR(eCSR_ROAM_INFRA_IND);
|
||||
CASE_RETURN_STR(eCSR_ROAM_WPS_PBC_PROBE_REQ_IND);
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
CASE_RETURN_STR(eCSR_ROAM_FT_RESPONSE);
|
||||
#endif
|
||||
CASE_RETURN_STR(eCSR_ROAM_FT_START);
|
||||
CASE_RETURN_STR(eCSR_ROAM_REMAIN_CHAN_READY);
|
||||
CASE_RETURN_STR(eCSR_ROAM_SEND_ACTION_CNF);
|
||||
|
|
@ -1833,10 +1831,8 @@ bool csr_is_profile_rsn(tCsrRoamProfile *pProfile)
|
|||
switch (pProfile->negotiatedAuthType) {
|
||||
case eCSR_AUTH_TYPE_RSN:
|
||||
case eCSR_AUTH_TYPE_RSN_PSK:
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
case eCSR_AUTH_TYPE_FT_RSN:
|
||||
case eCSR_AUTH_TYPE_FT_RSN_PSK:
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
case eCSR_AUTH_TYPE_CCKM_RSN:
|
||||
#endif
|
||||
|
|
@ -2343,13 +2339,18 @@ CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac,
|
|||
return CDF_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
/* Function to return true if the authtype is 11r */
|
||||
bool csr_is_auth_type11r(eCsrAuthType AuthType, uint8_t mdiePresent)
|
||||
/**
|
||||
* csr_is_auth_type11r() - Check if Authentication type is 11R
|
||||
* @auth_type: The authentication type that is used to make the connection
|
||||
* @mdie_present: Is MDIE IE present
|
||||
*
|
||||
* Return: true if is 11R auth type, false otherwise
|
||||
*/
|
||||
bool csr_is_auth_type11r(eCsrAuthType auth_type, uint8_t mdie_present)
|
||||
{
|
||||
switch (AuthType) {
|
||||
switch (auth_type) {
|
||||
case eCSR_AUTH_TYPE_OPEN_SYSTEM:
|
||||
if (mdiePresent)
|
||||
if (mdie_present)
|
||||
return true;
|
||||
break;
|
||||
case eCSR_AUTH_TYPE_FT_RSN_PSK:
|
||||
|
|
@ -2369,7 +2370,6 @@ bool csr_is_profile11r(tCsrRoamProfile *pProfile)
|
|||
pProfile->MDID.mdiePresent);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
|
||||
|
|
@ -2531,7 +2531,6 @@ static bool csr_is_auth_wapi_psk(tpAniSirGlobal pMac,
|
|||
}
|
||||
#endif /* FEATURE_WLAN_WAPI */
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
|
||||
/*
|
||||
* Function for 11R FT Authentication. We match the FT Authentication Cipher
|
||||
|
|
@ -2557,7 +2556,6 @@ static bool csr_is_ft_auth_rsn_psk(tpAniSirGlobal pMac,
|
|||
(pMac, AllSuites, cAllSuites, csr_rsn_oui[04], Oui);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
|
||||
|
|
@ -2751,7 +2749,6 @@ bool csr_get_rsn_information(tHalHandle hal, tCsrAuthList *auth_type,
|
|||
* Ciphers are supported, Match authentication algorithm and
|
||||
* pick first matching authtype.
|
||||
*/
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
/* Changed the AKM suites according to order of preference */
|
||||
if (csr_is_ft_auth_rsn(mac_ctx, authsuites,
|
||||
c_auth_suites, authentication)) {
|
||||
|
|
@ -2765,7 +2762,6 @@ bool csr_get_rsn_information(tHalHandle hal, tCsrAuthList *auth_type,
|
|||
auth_type->authType[i])
|
||||
neg_authtype = eCSR_AUTH_TYPE_FT_RSN_PSK;
|
||||
}
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_ESE
|
||||
/* ESE only supports 802.1X. No PSK. */
|
||||
if ((neg_authtype == eCSR_AUTH_TYPE_UNKNOWN) &&
|
||||
|
|
@ -4832,7 +4828,6 @@ bool csr_match_bss(tHalHandle hal, tSirBssDescription *bss_descr,
|
|||
if (!check)
|
||||
goto end;
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
if (filter->MDID.mdiePresent && csr_roam_is11r_assoc(mac_ctx,
|
||||
mac_ctx->roam.roamSession->sessionId)) {
|
||||
if (bss_descr->mdiePresent) {
|
||||
|
|
@ -4844,7 +4839,6 @@ bool csr_match_bss(tHalHandle hal, tSirBssDescription *bss_descr,
|
|||
goto end;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
rc = true;
|
||||
|
||||
end:
|
||||
|
|
|
|||
|
|
@ -43,10 +43,8 @@
|
|||
#include "host_diag_core_event.h"
|
||||
#include "host_diag_core_log.h"
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
#include "sms_debug.h"
|
||||
#include "utils_parser.h"
|
||||
#endif
|
||||
#include "sme_power_save_api.h"
|
||||
|
||||
#ifndef WLAN_MDM_CODE_REDUCTION_OPT
|
||||
|
|
@ -266,21 +264,28 @@ typedef struct sme_QosACInfo_s {
|
|||
sme_QosStates prev_state;
|
||||
sme_QosWmmTspecInfo curr_QoSInfo[SME_QOS_TSPEC_INDEX_MAX];
|
||||
sme_QosWmmTspecInfo requested_QoSInfo[SME_QOS_TSPEC_INDEX_MAX];
|
||||
bool reassoc_pending; /* reassoc requested for APSD */
|
||||
/* As per WMM spec there could be max 2 TSPEC running on the same AC with */
|
||||
/* different direction. We will refer each TSPEC with an index */
|
||||
uint8_t tspec_mask_status; /* status showing if both the indices are in use */
|
||||
uint8_t tspec_pending; /* tspec negotiation going on for which index */
|
||||
bool hoRenewal; /* set to true while re-negotiating flows after */
|
||||
/* handoff, will set to false once done with */
|
||||
/* the process. Helps SME to decide if at all */
|
||||
/* to notify HDD/LIS for flow renewal after HO */
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
/* reassoc requested for APSD */
|
||||
bool reassoc_pending;
|
||||
/*
|
||||
* As per WMM spec there could be max 2 TSPEC running on the same
|
||||
* AC with different direction. We will refer each TSPEC with an index
|
||||
*/
|
||||
/* status showing if both the indices are in use */
|
||||
uint8_t tspec_mask_status;
|
||||
/* tspec negotiation going on for which index */
|
||||
uint8_t tspec_pending;
|
||||
/* set to true while re-negotiating flows after */
|
||||
bool hoRenewal;
|
||||
/*
|
||||
* handoff, will set to false once done with the process. Helps SME to
|
||||
* decide if at all to notify HDD/LIS for flow renewal after HO
|
||||
*/
|
||||
uint8_t ricIdentifier[SME_QOS_TSPEC_INDEX_MAX];
|
||||
/* stores the ADD TS response for each AC. The ADD TS response is formed by
|
||||
parsing the RIC received in the the reassoc response */
|
||||
/*
|
||||
* stores the ADD TS response for each AC. The ADD TS response is
|
||||
* formed by parsing the RIC received in the the reassoc response
|
||||
*/
|
||||
tSirAddtsRsp addTsRsp[SME_QOS_TSPEC_INDEX_MAX];
|
||||
#endif
|
||||
sme_QosRelTriggers relTrig;
|
||||
|
||||
} sme_QosACInfo;
|
||||
|
|
@ -313,9 +318,7 @@ typedef struct sme_QosSessionInfo_s {
|
|||
/* commands that are being buffered for this session */
|
||||
tDblLinkList bufferedCommandList;
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
bool ftHandoffInProgress;
|
||||
#endif
|
||||
|
||||
} sme_QosSessionInfo;
|
||||
/*---------------------------------------------------------------------------
|
||||
|
|
@ -411,7 +414,6 @@ CDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac,
|
|||
uint8_t sessionId, void *pEvent_info);
|
||||
CDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac,
|
||||
uint8_t sessionId, void *pEvent_info);
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
CDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal pMac,
|
||||
uint8_t sessionId,
|
||||
void *pEvent_info);
|
||||
|
|
@ -419,7 +421,6 @@ CDF_STATUS sme_qos_process_set_key_success_ind(tpAniSirGlobal pMac,
|
|||
uint8_t sessionId, void *pEvent_info);
|
||||
CDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal pMac, void *pMsgBuf);
|
||||
CDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal pMac, uint8_t sessionId);
|
||||
#endif
|
||||
CDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac,
|
||||
uint8_t sessionId,
|
||||
tSirAddtsRspInfo *pRsp);
|
||||
|
|
@ -839,11 +840,9 @@ CDF_STATUS sme_qos_msg_processor(tpAniSirGlobal mac_ctx,
|
|||
case eWNI_SME_DELTS_IND:
|
||||
status = sme_qos_process_del_ts_ind(mac_ctx, msg);
|
||||
break;
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
case eWNI_SME_FT_AGGR_QOS_RSP:
|
||||
status = sme_qos_process_aggr_qos_rsp(mac_ctx, msg);
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
/* err msg */
|
||||
CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
|
||||
|
|
@ -981,7 +980,6 @@ CDF_STATUS sme_qos_csr_event_ind(tpAniSirGlobal pMac,
|
|||
sme_qos_process_handoff_failure_ev(pMac, sessionId,
|
||||
pEvent_info);
|
||||
break;
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
case SME_QOS_CSR_PREAUTH_SUCCESS_IND:
|
||||
status =
|
||||
sme_qos_process_preauth_success_ind(pMac, sessionId,
|
||||
|
|
@ -992,7 +990,6 @@ CDF_STATUS sme_qos_csr_event_ind(tpAniSirGlobal pMac,
|
|||
sme_qos_process_set_key_success_ind(pMac, sessionId,
|
||||
pEvent_info);
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
/* Err msg */
|
||||
CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
|
||||
|
|
@ -3165,7 +3162,6 @@ uint8_t sme_qos_ese_retrieve_tspec_info(tpAniSirGlobal mac_ctx,
|
|||
|
||||
#endif
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
|
||||
CDF_STATUS sme_qos_create_tspec_ricie(tpAniSirGlobal pMac,
|
||||
sme_QosWmmTspecInfo *pTspec_Info,
|
||||
|
|
@ -3865,8 +3861,6 @@ CDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx,
|
|||
return status;
|
||||
}
|
||||
|
||||
#endif /* WLAN_FEATURE_VOWIFI_11R */
|
||||
|
||||
/**
|
||||
* sme_qos_add_ts_req() - send ADDTS request.
|
||||
* @pMac: Pointer to the global MAC parameter structure.
|
||||
|
|
@ -4122,19 +4116,16 @@ CDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf)
|
|||
sme_QosSessionInfo *pSession;
|
||||
uint8_t sessionId = paddts_rsp->sessionId;
|
||||
CDF_STATUS status = CDF_STATUS_E_FAILURE;
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
sme_QosWmmUpType up =
|
||||
(sme_QosWmmUpType) paddts_rsp->rsp.tspec.tsinfo.traffic.userPrio;
|
||||
sme_QosACInfo *pACInfo;
|
||||
sme_QosEdcaAcType ac;
|
||||
#endif
|
||||
#ifdef FEATURE_WLAN_DIAG_SUPPORT
|
||||
WLAN_HOST_DIAG_EVENT_DEF(qos, host_event_wlan_qos_payload_type);
|
||||
#endif
|
||||
|
||||
pSession = &sme_qos_cb.sessionInfo[sessionId];
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
|
||||
"%s: %d: invoked on session %d for UP %d",
|
||||
__func__, __LINE__, sessionId, up);
|
||||
|
|
@ -4157,7 +4148,6 @@ CDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf)
|
|||
pSession->readyForPowerSave = true;
|
||||
return CDF_STATUS_SUCCESS;
|
||||
}
|
||||
#endif
|
||||
|
||||
CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
|
||||
"%s: %d: Invoked on session %d with return code %d",
|
||||
|
|
@ -4399,7 +4389,6 @@ CDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId
|
|||
__func__, __LINE__, sessionId);
|
||||
pSession = &sme_qos_cb.sessionInfo[sessionId];
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
if (pSession->ftHandoffInProgress) {
|
||||
CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
|
||||
"%s: %d: no need for state transition, should "
|
||||
|
|
@ -4414,7 +4403,6 @@ CDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId
|
|||
sme_qos_process_ft_reassoc_req_ev(sessionId);
|
||||
return CDF_STATUS_SUCCESS;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (pSession->handoffRequested) {
|
||||
CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
|
||||
|
|
@ -4435,7 +4423,6 @@ CDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId
|
|||
return CDF_STATUS_SUCCESS;
|
||||
}
|
||||
/* TBH: Assuming both handoff algo & 11r willn't be enabled at the same time */
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
if (pSession->ftHandoffInProgress) {
|
||||
CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
|
||||
"%s: %d: no need for state transition, should "
|
||||
|
|
@ -4452,7 +4439,6 @@ CDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId
|
|||
sme_qos_process_ft_reassoc_req_ev(sessionId);
|
||||
return CDF_STATUS_SUCCESS;
|
||||
}
|
||||
#endif
|
||||
|
||||
for (ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) {
|
||||
pACInfo = &pSession->ac_info[ac];
|
||||
|
|
@ -4641,7 +4627,6 @@ CDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx,
|
|||
(void)sme_qos_process_buffered_cmd(sessionid);
|
||||
return CDF_STATUS_SUCCESS;
|
||||
}
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
if (qos_session->ftHandoffInProgress) {
|
||||
if (csr_roam_is11r_assoc(mac_ctx, sessionid)) {
|
||||
if (csr_roam_session &&
|
||||
|
|
@ -4667,7 +4652,6 @@ CDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx,
|
|||
qos_session->handoffRequested = false;
|
||||
return status;
|
||||
}
|
||||
#endif
|
||||
|
||||
qos_session->sessionActive = true;
|
||||
for (ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) {
|
||||
|
|
@ -4796,7 +4780,6 @@ CDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac,
|
|||
break;
|
||||
case SME_QOS_HANDOFF:
|
||||
/* print error msg */
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
if (pSession->ftHandoffInProgress) {
|
||||
CDF_TRACE(CDF_MODULE_ID_SME,
|
||||
CDF_TRACE_LEVEL_INFO,
|
||||
|
|
@ -4805,7 +4788,6 @@ CDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac,
|
|||
__func__, __LINE__);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
case SME_QOS_CLOSED:
|
||||
case SME_QOS_INIT:
|
||||
|
|
@ -4879,12 +4861,10 @@ CDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac,
|
|||
case SME_QOS_LINK_UP:
|
||||
case SME_QOS_QOS_ON:
|
||||
default:
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
/* In case of 11r - RIC, we request QoS and Hand-off at the same time hence the
|
||||
state may be SME_QOS_REQUESTED */
|
||||
if (pSession->ftHandoffInProgress)
|
||||
break;
|
||||
#endif
|
||||
CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
|
||||
"%s: %d: On session %d AC %d is in wrong state %d",
|
||||
__func__, __LINE__,
|
||||
|
|
@ -4982,13 +4962,12 @@ CDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId,
|
|||
"%s: %d: invoked on session %d",
|
||||
__func__, __LINE__, sessionId);
|
||||
pSession = &sme_qos_cb.sessionInfo[sessionId];
|
||||
/*
|
||||
* In case of 11r - RIC, we request QoS and Hand-off at the
|
||||
* same time hence the state may be SME_QOS_REQUESTED
|
||||
*/
|
||||
if ((pSession->handoffRequested)
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
/* In case of 11r - RIC, we request QoS and Hand-off at the same time hence the
|
||||
state may be SME_QOS_REQUESTED */
|
||||
&& !pSession->ftHandoffInProgress
|
||||
#endif
|
||||
) {
|
||||
&& !pSession->ftHandoffInProgress) {
|
||||
CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
|
||||
"%s: %d: no need for state transition, should "
|
||||
"already be in handoff state", __func__, __LINE__);
|
||||
|
|
@ -5073,7 +5052,6 @@ CDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId,
|
|||
return CDF_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
#ifdef WLAN_FEATURE_VOWIFI_11R
|
||||
/**
|
||||
* sme_qos_process_preauth_success_ind() - process preauth success indication
|
||||
* @mac_ctx: global MAC context
|
||||
|
|
@ -5202,8 +5180,6 @@ add_next_ric:
|
|||
return status;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/*--------------------------------------------------------------------------
|
||||
\brief sme_qos_process_add_ts_failure_rsp() - Function to process the
|
||||
Addts request failure response came from PE
|
||||
|
|
|
|||
Loading…
Reference in a new issue