wlan: sme: remove obsolete "WLAN_SOFTAP_FEATURE" featurization
The current driver has evolved over time from a driver that originally
only supported "station" mode. When the initial support for "Soft AP"
mode was added, the code was added with conditional compilation so
that the "Soft AP" feature could be included or excluded based upon
the target needs. Now, however, there is an expectation that all
drivers will support both "station" mode and "Soft AP" mode.
Therefore remove the conditional compilation since "Soft AP" mode code
must always be present.
CRs-fixed: 452041
Change-Id: I7bbe5e568cb72802ac0d02f4b30bc8afa02281bf
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index 7ae38a8..f882c69 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -162,9 +162,7 @@
typedef enum
{
eCSR_BSS_TYPE_INFRASTRUCTURE,
-#ifdef WLAN_SOFTAP_FEATURE
eCSR_BSS_TYPE_INFRA_AP, // SoftAP AP
-#endif
eCSR_BSS_TYPE_IBSS, // an IBSS network we will NOT start
eCSR_BSS_TYPE_START_IBSS, // an IBSS network we will start if no partners detected.
eCSR_BSS_TYPE_WDS_AP, // BT-AMP AP
@@ -429,11 +427,9 @@
eCSR_ROAM_IBSS_LEAVE, //IBSS indications.
//BSS in WDS mode status indication
eCSR_ROAM_WDS_IND,
-#ifdef WLAN_SOFTAP_FEATURE
//BSS in SoftAP mode status indication
eCSR_ROAM_INFRA_IND,
eCSR_ROAM_WPS_PBC_PROBE_REQ_IND,
-#endif
#ifdef WLAN_FEATURE_VOWIFI_11R
eCSR_ROAM_FT_RESPONSE,
#endif
@@ -517,7 +513,6 @@
eCSR_ROAM_RESULT_WDS_NOT_ASSOCIATED,
// WDS disassociated
eCSR_ROAM_RESULT_WDS_DISASSOCIATED,
-#ifdef WLAN_SOFTAP_FEATURE
// INFRA started successfully
eCSR_ROAM_RESULT_INFRA_STARTED,
// INFRA start failed
@@ -531,7 +526,6 @@
// INFRA disassociated
eCSR_ROAM_RESULT_INFRA_DISASSOCIATED,
eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND,
-#endif
#ifdef WLAN_FEATURE_P2P
eCSR_ROAM_RESULT_SEND_ACTION_FAIL,
#endif
@@ -592,12 +586,10 @@
eCSR_ASSOC_STATE_TYPE_WDS_DISCONNECTED,
// Participating in a WDS network and connected peer to peer
eCSR_ASSOC_STATE_TYPE_WDS_CONNECTED,
-#ifdef WLAN_SOFTAP_FEATURE
// Participating in a Infra network in AP not yet in connected state
eCSR_ASSOC_STATE_TYPE_INFRA_DISCONNECTED,
// Participating in a Infra network and connected to a peer
eCSR_ASSOC_STATE_TYPE_INFRA_CONNECTED,
-#endif
}eCsrConnectState;
@@ -854,7 +846,6 @@
tANI_U32 nWSCReqIELength; //The byte count in the pWSCReqIE
tANI_U8 *pWSCReqIE; //If not null, it has the IE byte stream for WSC
-#ifdef WLAN_SOFTAP_FEATURE
tANI_U8 ieee80211d;
tANI_U8 privacy;
tANI_BOOLEAN fwdWPSPBCProbeReq;
@@ -865,7 +856,6 @@
tANI_BOOLEAN obssProtEnabled;
tANI_U16 cfg_protection;
tANI_U8 wps_state;
-#endif
#ifdef WLAN_FEATURE_VOWIFI_11R
tCsrMobilityDomainInfo MDID;
@@ -1128,15 +1118,11 @@
{
tSirMicFailureInfo *pMICFailureInfo;
tCsrRoamConnectedProfile *pConnectedProfile;
-#ifdef WLAN_SOFTAP_FEATURE
tSirWPSPBCProbeReq *pWPSPBCProbeReq;
-#endif
} u;
-#ifdef WLAN_SOFTAP_FEATURE
tANI_BOOLEAN wmmEnabledSta; //set to true if WMM enabled STA
tANI_U32 dtimPeriod;
-#endif
#ifdef FEATURE_WLAN_CCX
tANI_BOOLEAN isCCXAssoc;
@@ -1171,7 +1157,6 @@
}tCsrFreqScanInfo;
-#ifdef WLAN_SOFTAP_FEATURE
typedef struct sSirSmeAssocIndToUpperLayerCnf
{
tANI_U16 messageType; // eWNI_SME_ASSOC_CNF
@@ -1188,7 +1173,6 @@
tSirAddie addIE; // Additional IE received from peer, which can be WSC and/or P2P IE
tANI_U8 reassocReq; //set to true if reassoc
} tSirSmeAssocIndToUpperLayerCnf, *tpSirSmeAssocIndToUpperLayerCnf;
-#endif
typedef struct tagCsrSummaryStatsInfo
{
@@ -1395,14 +1379,10 @@
#define CSR_IS_WDS_AP( pProfile ) ( eCSR_BSS_TYPE_WDS_AP == (pProfile)->BSSType )
#define CSR_IS_WDS_STA( pProfile ) ( eCSR_BSS_TYPE_WDS_STA == (pProfile)->BSSType )
#define CSR_IS_WDS( pProfile ) ( CSR_IS_WDS_AP( pProfile ) || CSR_IS_WDS_STA( pProfile ) )
-#ifdef WLAN_SOFTAP_FEATURE
#define CSR_IS_INFRA_AP( pProfile ) ( eCSR_BSS_TYPE_INFRA_AP == (pProfile)->BSSType )
-#endif
//pProfile - pointer to tCsrRoamConnectedProfile
-#ifdef WLAN_SOFTAP_FEATURE
#define CSR_IS_CONN_INFRA_AP( pProfile ) ( eCSR_BSS_TYPE_INFRA_AP == (pProfile)->BSSType )
-#endif
#define CSR_IS_CONN_WDS_AP( pProfile ) ( eCSR_BSS_TYPE_WDS_AP == (pProfile)->BSSType )
#define CSR_IS_CONN_WDS_STA( pProfile ) ( eCSR_BSS_TYPE_WDS_STA == (pProfile)->BSSType )
#define CSR_IS_CONN_WDS( pProfile ) ( CSR_IS_WDS_AP( pProfile ) || CSR_IS_WDS_STA( pProfile ) )
@@ -1413,7 +1393,6 @@
-#ifdef WLAN_SOFTAP_FEATURE
/* ---------------------------------------------------------------------------
\fn csrSetChannels
\brief HDD calls this function to change some global settings.
@@ -1425,7 +1404,6 @@
eHalStatus csrSetChannels(tHalHandle hHal, tCsrConfigParam *pParam );
eHalStatus csrSetRegInfo(tHalHandle hHal, tANI_U8 *apCntryCode);
-#endif
//enum to string conversion for debug output
diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h
index 0c0ab82..d617d8c 100644
--- a/CORE/SME/inc/csrInternal.h
+++ b/CORE/SME/inc/csrInternal.h
@@ -120,10 +120,8 @@
#ifdef WLAN_FEATURE_11AC
eCSR_CFG_DOT11_MODE_11AC,
#endif
-#ifdef WLAN_SOFTAP_FEATURE
eCSR_CFG_DOT11_MODE_11G_ONLY,
eCSR_CFG_DOT11_MODE_11N_ONLY,
-#endif
#ifdef WLAN_FEATURE_11AC
eCSR_CFG_DOT11_MODE_11AC_ONLY,
#endif
@@ -356,7 +354,6 @@
tSirMacRateSet extendedRateSet;
tANI_U8 operationChn;
eCsrCfgDot11Mode uCfgDot11Mode;
-#ifdef WLAN_SOFTAP_FEATURE
tANI_U8 privacy;
tANI_BOOLEAN fwdWPSPBCProbeReq;
tANI_BOOLEAN protEnabled;
@@ -368,7 +365,6 @@
tANI_U8 ApUapsdEnable;
tANI_U8 ssidHidden;
tANI_U8 wps_state;
-#endif
tVOS_CON_MODE bssPersona;
tANI_U16 nRSNIELength; //The byte count in the pRSNIE, if 0, pRSNIE is ignored.
tANI_U8 *pRSNIE; //If not null, it has the IE byte stream for RSN
@@ -582,10 +578,8 @@
tANI_U8 nTxPowerCap;
tANI_U32 statsReqPeriodicity; //stats request frequency from PE while in full power
tANI_U32 statsReqPeriodicityInPS;//stats request frequency from PE while in power save
-#ifdef WLAN_SOFTAP_FEATURE
tANI_U32 dtimPeriod;
tANI_BOOLEAN ssidHidden;
-#endif
#ifdef WLAN_FEATURE_VOWIFI_11R
tCsr11rConfig csr11rConfig;
@@ -1128,9 +1122,7 @@
eHalStatus csrIsBTAMPAllowed( tpAniSirGlobal pMac, tANI_U32 chnId );
tANI_BOOLEAN csrIsValidMcConcurrentSession(tpAniSirGlobal pMac, tANI_U32 sessionId,
tSirBssDescription *pBssDesc);
-#ifdef WLAN_SOFTAP_FEATURE
tANI_BOOLEAN csrIsConnStateConnectedInfraAp( tpAniSirGlobal pMac, tANI_U32 sessionId );
-#endif
/*----------------------------------------------------------------------------
\fn csrRoamRegisterLinkQualityIndCallback
@@ -1269,10 +1261,8 @@
tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe );
#endif /* FEATURE_WLAN_WAPI */
-#ifdef WLAN_SOFTAP_FEATURE
eHalStatus csrRoamUpdateAPWPSIE( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirAPWPSIEs *pAPWPSIES );
eHalStatus csrRoamUpdateWPARSNIEs( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirRSNie * pAPSirRSNie);
-#endif
void csrSetCfgPrivacy( tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, tANI_BOOLEAN fPrivacy );
tANI_S8 csrGetInfraSessionId( tpAniSirGlobal pMac );
tANI_U8 csrGetInfraOperationChannel( tpAniSirGlobal pMac, tANI_U8 sessionId);
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
old mode 100755
new mode 100644
index 21cd48c..53ece07
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -291,7 +291,6 @@
eHalStatus sme_UpdateChannelConfig(tHalHandle hHal);
#endif // FEATURE_WLAN_SCAN_PNLO
-#ifdef WLAN_SOFTAP_FEATURE
/*--------------------------------------------------------------------------
\brief sme_set11dinfo() - Set the 11d information about valid channels
@@ -331,7 +330,6 @@
eHalStatus sme_setRegInfo(tHalHandle hHal, tANI_U8 *apCntryCode);
-#endif
/* ---------------------------------------------------------------------------
\fn sme_ChangeConfigParams
@@ -561,7 +559,6 @@
---------------------------------------------------------------------------*/
eHalStatus sme_RoamDisconnect(tHalHandle hHal, tANI_U8 sessionId, eCsrRoamDisconnectReason reason);
-#ifdef WLAN_SOFTAP_FEATURE
/* ---------------------------------------------------------------------------
\fn sme_RoamStopBss
\brief a wrapper function to request CSR to stop bss
@@ -626,7 +623,6 @@
eHalStatus sme_RoamGetWpsSessionOverlap(tHalHandle hHal, tANI_U8 sessionId,
void *pUsrContext, void *pfnSapEventCallback,
v_MACADDR_t pRemoveMac);
-#endif
/* ---------------------------------------------------------------------------
\fn sme_RoamGetConnectState
@@ -1606,7 +1602,6 @@
#endif /*FEATURE_OEM_DATA_SUPPORT*/
-#ifdef WLAN_SOFTAP_FEATURE
/* ---------------------------------------------------------------------------
@@ -1653,7 +1648,6 @@
eHalStatus sme_ChangeMCCBeaconInterval(tHalHandle hHal, tANI_U8 sessionId);
-#endif
/* ---------------------------------------------------------------------------
\fn sme_sendBTAmpEvent
@@ -2125,7 +2119,6 @@
eHalStatus sme_SetMaxTxPower(tHalHandle hHal, tSirMacAddr pBssid,
tSirMacAddr pSelfMacAddress, v_S7_t dB);
-#ifdef WLAN_SOFTAP_FEATURE
/* ---------------------------------------------------------------------------
\fn sme_HideSSID
@@ -2140,7 +2133,6 @@
-------------------------------------------------------------------------------*/
eHalStatus sme_HideSSID(tHalHandle hHal, v_U8_t sessionId, v_U8_t ssidHidden);
-#endif
/* ---------------------------------------------------------------------------
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
old mode 100755
new mode 100644
index 7a72aa1..ee67ae8
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -249,11 +249,7 @@
pStaEntry is no longer invalid upon the return of this function.
*/
static void csrRoamRemoveStatListEntry(tpAniSirGlobal pMac, tListElem *pEntry);
-#ifdef WLAN_SOFTAP_FEATURE
static eCsrCfgDot11Mode csrRoamGetPhyModeBandForBss( tpAniSirGlobal pMac, tCsrRoamProfile *pProfile,tANI_U8 operationChn, eCsrBand *pBand );
-#else
-static eCsrCfgDot11Mode csrRoamGetPhyModeBandForBss( tpAniSirGlobal pMac, eCsrPhyMode phyModeIn, tANI_U8 operationChn, eCsrBand *pBand );
-#endif
static eHalStatus csrRoamGetQosInfoFromBss(tpAniSirGlobal pMac, tSirBssDescription *pBssDesc);
tCsrStatsClientReqInfo * csrRoamInsertEntryIntoList( tpAniSirGlobal pMac,
tDblLinkList *pStaList,
@@ -361,7 +357,6 @@
return (status);
}
-#ifdef WLAN_SOFTAP_FEATURE
eHalStatus csrSetRegInfo(tHalHandle hHal, tANI_U8 *apCntryCode)
{
eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -438,7 +433,6 @@
return status;
}
-#endif
eHalStatus csrClose(tpAniSirGlobal pMac)
{
eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -1461,13 +1455,8 @@
pMac->roam.configParam.impsSleepTime = 0;
}
pMac->roam.configParam.eBand = pParam->eBand;
-#ifdef WLAN_SOFTAP_FEATURE
pMac->roam.configParam.uCfgDot11Mode = csrGetCfgDot11ModeFromCsrPhyMode(NULL, pMac->roam.configParam.phyMode,
pMac->roam.configParam.ProprietaryRatesEnabled);
-#else
- pMac->roam.configParam.uCfgDot11Mode = csrGetCfgDot11ModeFromCsrPhyMode(pMac->roam.configParam.phyMode,
- pMac->roam.configParam.ProprietaryRatesEnabled);
-#endif
//if HDD passed down non zero values for age params, then only update,
//otherwise keep using the defaults
if (pParam->nScanResultAgeCount)
@@ -1868,7 +1857,6 @@
}
}
}
-#ifdef WLAN_SOFTAP_FEATURE
#define INFRA_AP_DEFAULT_CHANNEL 6
eHalStatus csrIsValidChannel(tpAniSirGlobal pMac, tANI_U8 chnNum)
{
@@ -1883,7 +1871,6 @@
}
return status;
}
-#endif
eHalStatus csrInitGetChannels(tpAniSirGlobal pMac)
{
eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -2324,7 +2311,6 @@
return (status);
}
-#ifdef WLAN_SOFTAP_FEATURE
/* ---------------------------------------------------------------------------
\fn csrRoamIssueDisassociateStaCmd
@@ -2493,7 +2479,6 @@
return (status);
}
-#endif
eHalStatus csrRoamIssueDeauth( tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrRoamSubState NewSubstate )
{
eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -2747,24 +2732,17 @@
{
operationChannel = pProfile->ChannelInfo.ChannelList[0];
}
-#ifdef WLAN_SOFTAP_FEATURE
pBssConfig->uCfgDot11Mode = csrRoamGetPhyModeBandForBss(pMac, pProfile, operationChannel,
&pBssConfig->eBand);
-#else
- pBssConfig->uCfgDot11Mode = csrRoamGetPhyModeBandForBss(pMac, (eCsrPhyMode)pProfile->phyMode, operationChannel,
- &pBssConfig->eBand);
-#endif
//QOS
//Is this correct to always set to this //***
if ( pBssConfig->BssCap.ess == 1 )
{
-#ifdef WLAN_SOFTAP_FEATURE
/*For Softap case enable WMM*/
if(CSR_IS_INFRA_AP(pProfile) && (eCsrRoamWmmNoQos != pMac->roam.configParam.WMMSupportMode )){
qAPisEnabled = TRUE;
}
else
-#endif
if (csrRoamGetQosInfoFromBss(pMac, pBssDesc) == eHAL_STATUS_SUCCESS) {
qAPisEnabled = TRUE;
} else {
@@ -3313,11 +3291,7 @@
{
operationChannel = pProfile->ChannelInfo.ChannelList[0];
}
-#ifdef WLAN_SOFTAP_FEATURE
cfgDot11Mode = csrRoamGetPhyModeBandForBss( pMac, pProfile, operationChannel, &eBand );
-#else
- cfgDot11Mode = csrRoamGetPhyModeBandForBss( pMac, (eCsrPhyMode)pProfile->phyMode, operationChannel, &eBand );
-#endif
// For 11a networks, the 11a rates go into the Operational Rate set. For 11b and 11g
// networks, the 11b rates appear in the Operational Rate set. In either case,
// we can blindly put the rates we support into our Operational Rate set
@@ -3514,12 +3488,10 @@
csrSetCfgPrivacy(pMac, pProfile, (tANI_BOOLEAN)pBssConfig->BssCap.privacy );
//short slot time
ccmCfgSetInt(pMac, WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED, pBssConfig->uShortSlotTime, NULL, eANI_BOOLEAN_FALSE);
-#ifdef WLAN_SOFTAP_FEATURE
//11d
ccmCfgSetInt(pMac, WNI_CFG_11D_ENABLED,
((pBssConfig->f11hSupport) ? pBssConfig->f11hSupport : pProfile->ieee80211d),
NULL, eANI_BOOLEAN_FALSE);
-#endif
/*//11h
ccmCfgSetInt(pMac, WNI_CFG_11H_ENABLED, pMac->roam.configParam.Is11hSupportEnabled, NULL, eANI_BOOLEAN_FALSE);
*/
@@ -3608,9 +3580,7 @@
pSession->bssParams.cbMode= pBssConfig->cbMode;
//For IBSS, we need to prepare some more information
if( csrIsBssTypeIBSS(pProfile->BSSType) || CSR_IS_WDS( pProfile )
-#ifdef WLAN_SOFTAP_FEATURE
|| CSR_IS_INFRA_AP(pProfile)
-#endif
)
{
csrRoamPrepareBssParams(pMac, sessionId, pProfile, pBssDesc, pBssConfig, pIes);
@@ -3651,9 +3621,7 @@
// Neiher in IBSS nor in Infra. We can go ahead and set the CFG for tne new network...
// Nothing to stop.
if ( pBssDesc || CSR_IS_WDS_AP( pProfile )
-#ifdef WLAN_SOFTAP_FEATURE
|| CSR_IS_INFRA_AP(pProfile)
-#endif
)
{
// Set parameters for this Bss.
@@ -4018,9 +3986,7 @@
break;
}
else if ( (CSR_IS_WDS_AP(pProfile))
-#ifdef WLAN_SOFTAP_FEATURE
|| (CSR_IS_INFRA_AP(pProfile))
-#endif
)
{
// Attempt to start this WDS...
@@ -4126,7 +4092,6 @@
fComplete = eANI_BOOLEAN_TRUE;
}
}
-#ifdef WLAN_SOFTAP_FEATURE
else if (csrIsConnStateConnectedInfraAp(pMac, sessionId))
{
status = csrRoamIssueStopBss( pMac, sessionId, eCSR_ROAM_SUBSTATE_STOP_BSS_REQ );
@@ -4137,7 +4102,6 @@
fComplete = eANI_BOOLEAN_TRUE;
}
}
-#endif
else
{
fComplete = eANI_BOOLEAN_TRUE;
@@ -4761,9 +4725,7 @@
eCsrRoamResult roamResult;
eHalStatus status;
tANI_U32 key_timeout_interval = 0;
-#ifdef WLAN_SOFTAP_FEATURE
tSirSmeStartBssRsp *pSmeStartBssRsp = NULL;
-#endif
if(!pSession)
{
@@ -5069,20 +5031,16 @@
// the Bss Description that we start beaconing for the newly started Ibss.
smsLog(pMac, LOG2, FL("receives start BSS ok indication\n"));
status = eHAL_STATUS_FAILURE;
-#ifdef WLAN_SOFTAP_FEATURE
pSmeStartBssRsp = (tSirSmeStartBssRsp *)Context;
-#endif
palZeroMemory(pMac->hHdd, &roamInfo, sizeof(tCsrRoamInfo));
if( CSR_IS_IBSS( pProfile ) )
{
pSession->connectState = eCSR_ASSOC_STATE_TYPE_IBSS_DISCONNECTED;
}
-#ifdef WLAN_SOFTAP_FEATURE
else if (CSR_IS_INFRA_AP(pProfile))
{
pSession->connectState = eCSR_ASSOC_STATE_TYPE_INFRA_DISCONNECTED;
}
-#endif
else
{
pSession->connectState = eCSR_ASSOC_STATE_TYPE_WDS_DISCONNECTED;
@@ -5090,11 +5048,7 @@
if( !CSR_IS_WDS_STA( pProfile ) )
{
csrRoamStateChange( pMac, eCSR_ROAMING_STATE_JOINED, sessionId );
-#ifdef WLAN_SOFTAP_FEATURE
pSirBssDesc = &pSmeStartBssRsp->bssDescription;
-#else
- pSirBssDesc = (tSirBssDescription *)Context;
-#endif
if( !HAL_STATUS_SUCCESS(csrGetParsedBssDescriptionIEs( pMac, pSirBssDesc, &pIes )) )
{
smsLog(pMac, LOG2, FL("cannot parse IBSS IEs\n"));
@@ -5104,9 +5058,7 @@
eCSR_ROAM_IBSS_IND, eCSR_ROAM_RESULT_IBSS_START_FAILED );
break;
}
-#ifdef WLAN_SOFTAP_FEATURE
if (!CSR_IS_INFRA_AP(pProfile))
-#endif
{
pScanResult = csrScanAppendBssDescription( pMac, pSirBssDesc, pIes );
}
@@ -5153,13 +5105,8 @@
#endif //#ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
//Only set context for non-WDS_STA. We don't even need it for WDS_AP. But since the encryption
//is WPA2-PSK so it won't matter.
-#ifdef WLAN_SOFTAP_FEATURE
if( CSR_IS_ENC_TYPE_STATIC( pProfile->negotiatedUCEncryptionType ) && !CSR_IS_INFRA_AP( pSession->pCurRoamProfile ))
{
-#else
- if( CSR_IS_ENC_TYPE_STATIC( pProfile->negotiatedUCEncryptionType ))
- {
-#endif
// Issue the set Context request to LIM to establish the Broadcast STA context for the Ibss.
csrRoamIssueSetContextReq( pMac, sessionId,
pProfile->negotiatedMCEncryptionType,
@@ -5200,13 +5147,11 @@
roamStatus = eCSR_ROAM_WDS_IND;
roamResult = eCSR_ROAM_RESULT_WDS_STARTED;
}
-#ifdef WLAN_SOFTAP_FEATURE
if( CSR_IS_INFRA_AP( pProfile ) )
{
roamStatus = eCSR_ROAM_INFRA_IND;
roamResult = eCSR_ROAM_RESULT_INFRA_STARTED;
}
-#endif
//Only tell upper layer is we start the BSS because Vista doesn't like multiple connection
//indications. If we don't start the BSS ourself, handler of eSIR_SME_JOINED_NEW_BSS will
@@ -5219,9 +5164,7 @@
//We start the IBSS (didn't find any matched IBSS out there)
roamInfo.pBssDesc = pSirBssDesc;
}
-#ifdef WLAN_SOFTAP_FEATURE
roamInfo.staId = (tANI_U8)pSmeStartBssRsp->staId;
-#endif
//Remove this code once SLM_Sessionization is supported
//BMPS_WORKAROUND_NOT_NEEDED
if(!IS_FEATURE_SUPPORTED_BY_FW(SLM_SESSIONIZATION) &&
@@ -5273,13 +5216,11 @@
roamStatus = eCSR_ROAM_WDS_IND;
roamResult = eCSR_ROAM_RESULT_WDS_STARTED;
}
-#ifdef WLAN_SOFTAP_FEATURE
if( CSR_IS_INFRA_AP( pProfile ) )
{
roamStatus = eCSR_ROAM_INFRA_IND;
roamResult = eCSR_ROAM_RESULT_INFRA_START_FAILED;
}
-#endif
if(Context)
{
pSirBssDesc = (tSirBssDescription *)Context;
@@ -5492,7 +5433,6 @@
#endif
csrScanStartIdleScan(pMac);
break;
-#ifdef WLAN_SOFTAP_FEATURE
case eCsrStopBss:
csrRoamCallCallback(pMac, sessionId, NULL,
pCommand->u.roamCmd.roamId,
@@ -5521,7 +5461,6 @@
}
}
break;
-#endif
case eCsrLostLink1:
// if lost link roam1 failed, then issue lost link Scan2 ...
csrScanRequestLostLink2(pMac, sessionId);
@@ -5670,7 +5609,6 @@
pDstProfile->bWPSAssociation = pSrcProfile->bWPSAssociation;
pDstProfile->uapsd_mask = pSrcProfile->uapsd_mask;
pDstProfile->beaconInterval = pSrcProfile->beaconInterval;
-#ifdef WLAN_SOFTAP_FEATURE
pDstProfile->privacy = pSrcProfile->privacy;
pDstProfile->fwdWPSPBCProbeReq = pSrcProfile->fwdWPSPBCProbeReq;
pDstProfile->csr80211AuthType = pSrcProfile->csr80211AuthType;
@@ -5682,7 +5620,6 @@
pDstProfile->cfg_protection = pSrcProfile->cfg_protection;
pDstProfile->wps_state = pSrcProfile->wps_state;
pDstProfile->ieee80211d = pSrcProfile->ieee80211d;
-#endif
palCopyMemory(pMac->hHdd, &pDstProfile->Keys, &pSrcProfile->Keys, sizeof(pDstProfile->Keys));
#ifdef WLAN_FEATURE_VOWIFI_11R
if (pSrcProfile->MDID.mdiePresent)
@@ -6019,12 +5956,10 @@
csrScanCancelIdleScan(pMac);
//Only abort the scan if it is not used for other roam/connect purpose
csrScanAbortMacScan(pMac);
-#ifdef WLAN_SOFTAP_FEATURE
if (!vos_concurrent_sessions_running() && (VOS_STA_SAP_MODE == pProfile->csrPersona))//In case of AP mode we do not want idle mode scan
{
csrScanDisable(pMac);
}
-#endif
csrRoamRemoveDuplicateCommand(pMac, sessionId, NULL, eCsrHddIssued);
//Check whether ssid changes
if(csrIsConnStateConnected(pMac, sessionId))
@@ -6088,9 +6023,7 @@
do
{
if( (pProfile && CSR_IS_WDS_AP( pProfile ) )
-#ifdef WLAN_SOFTAP_FEATURE
|| (pProfile && CSR_IS_INFRA_AP ( pProfile ))
-#endif
)
{
//This can be started right away
@@ -6831,14 +6764,11 @@
roamInfo.pBssDesc = pCommand->u.roamCmd.pLastRoamBss;
roamInfo.statusCode = pSession->joinFailStatusCode.statusCode;
roamInfo.reasonCode = pSession->joinFailStatusCode.reasonCode;
-#ifdef WLAN_SOFTAP_FEATURE
if (CSR_IS_WDS(&pSession->connectedProfile)){
-#endif
pSession->connectState = eCSR_ASSOC_STATE_TYPE_WDS_DISCONNECTED;
csrRoamCallCallback(pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId,
eCSR_ROAM_WDS_IND,
eCSR_ROAM_RESULT_WDS_DISASSOCIATED);
-#ifdef WLAN_SOFTAP_FEATURE
}else if (CSR_IS_INFRA_AP(&pSession->connectedProfile)){
pSession->connectState = eCSR_ASSOC_STATE_TYPE_INFRA_DISCONNECTED;
csrRoamCallCallback(pMac, sessionId, &roamInfo, pCommand->u.roamCmd.roamId,
@@ -6846,7 +6776,6 @@
eCSR_ROAM_RESULT_INFRA_DISASSOCIATED);
}
-#endif
if( !HAL_STATUS_SUCCESS( csrRoamIssueStopBss( pMac, sessionId, eCSR_ROAM_SUBSTATE_STOP_BSS_REQ ) ) )
{
@@ -7061,9 +6990,7 @@
}
if ( csrIsBssTypeIBSS( pCommand->u.roamCmd.roamProfile.BSSType ) ||
CSR_IS_WDS( &pCommand->u.roamCmd.roamProfile )
-#ifdef WLAN_SOFTAP_FEATURE
|| CSR_IS_INFRA_AP(&pCommand->u.roamCmd.roamProfile)
-#endif
)
{
if(!HAL_STATUS_SUCCESS(csrRoamIssueStartBss( pMac, sessionId,
@@ -7591,11 +7518,7 @@
//Let csrRoamComplete decide what to do
result = eCsrStartBssFailure;
}
-#ifdef WLAN_SOFTAP_FEATURE
csrRoamComplete( pMac, result, pSmeStartBssRsp);
-#else
- csrRoamComplete( pMac, result, &pSmeStartBssRsp->bssDescription );
-#endif
}
/*
@@ -7727,7 +7650,6 @@
smsLog( pMac, LOG2, FL("Stats rsp from PE\n"));
csrRoamStatsRspProcessor( pMac, pSirMsg );
break;
-#ifdef WLAN_SOFTAP_FEATURE
case eWNI_SME_UPPER_LAYER_ASSOC_CNF:
{
tCsrRoamSession *pSession;
@@ -7774,7 +7696,6 @@
}
break;
-#endif
default:
csrRoamCheckForLinkStatusChange( pMac, pSirMsg );
break;
@@ -8446,9 +8367,7 @@
tCsrRoamSession *pSession = NULL;
tpSirSmeSwitchChannelInd pSwitchChnInd;
tSmeMaxAssocInd *pSmeMaxAssocInd;
-#ifdef WLAN_SOFTAP_FEATURE
tSmeCmd pCommand;
-#endif
#if defined ANI_PRODUCT_TYPE_AP
pSirMsg->messageType = pal_be16_to_cpu(pSirMsg->messageType);
pSirMsg->length = pal_be16_to_cpu(pSirMsg->length);
@@ -8496,12 +8415,9 @@
pRoamInfo->paddIE = pAssocInd->addIE.addIEdata;
palCopyMemory(pMac->hHdd, pRoamInfo->peerMac, pAssocInd->peerMacAddr, sizeof(tSirMacAddr));
palCopyMemory(pMac->hHdd, &pRoamInfo->bssid, pAssocInd->bssId, sizeof(tCsrBssid));
-#ifdef WLAN_SOFTAP_FEATURE
pRoamInfo->wmmEnabledSta = pAssocInd->wmmEnabledSta;
if(CSR_IS_WDS_AP( pRoamInfo->u.pConnectedProfile))
-#endif
status = csrRoamCallCallback(pMac, sessionId, pRoamInfo, 0, eCSR_ROAM_WDS_IND, eCSR_ROAM_RESULT_WDS_ASSOCIATION_IND);//Sta
-#ifdef WLAN_SOFTAP_FEATURE
if(CSR_IS_INFRA_AP(pRoamInfo->u.pConnectedProfile))
{
if( CSR_IS_ENC_TYPE_STATIC( pSession->pCurRoamProfile->negotiatedUCEncryptionType ))
@@ -8520,7 +8436,6 @@
if (!HAL_STATUS_SUCCESS(status))
pRoamInfo->statusCode = eSIR_SME_ASSOC_REFUSED;// Refused due to Mac filtering
}
-#endif
/* Send Association completion message to PE */
status = csrSendAssocCnfMsg( pMac, pAssocInd, status );//Sta
@@ -8530,14 +8445,12 @@
{
status = csrSendAssocIndToUpperLayerCnfMsg(pMac, pAssocInd, status, sessionId);
}
-#ifdef WLAN_SOFTAP_FEATURE
else if(CSR_IS_INFRA_AP(pRoamInfo->u.pConnectedProfile) && (pRoamInfo->statusCode != eSIR_SME_ASSOC_REFUSED))
{
pRoamInfo->fReassocReq = pAssocInd->reassocReq;
//status = csrRoamCallCallback(pMac, sessionId, pRoamInfo, 0, eCSR_ROAM_INFRA_IND, eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF);
status = csrSendAssocIndToUpperLayerCnfMsg(pMac, pAssocInd, status, sessionId);
}
-#endif
}
}
break;
@@ -8589,7 +8502,6 @@
#endif
csrRoamLinkDown(pMac, sessionId);
csrRoamIssueWmStatusChange( pMac, sessionId, eCsrDisassociated, pSirMsg );
-#ifdef WLAN_SOFTAP_FEATURE
if(CSR_IS_INFRA_AP(&pSession->connectedProfile))
{
@@ -8615,7 +8527,6 @@
vos_mem_copy(pCommand.u.roamCmd.peerMac, pDisassocInd->peerMacAddr, sizeof(tSirMacAddr));
csrRoamRemoveDuplicateCommand(pMac, sessionId, &pCommand, eCsrForcedDeauthSta);
}
-#endif
}
break;
case eWNI_SME_DEAUTH_IND:
@@ -8663,7 +8574,6 @@
#endif
csrRoamLinkDown(pMac, sessionId);
csrRoamIssueWmStatusChange( pMac, sessionId, eCsrDeauthenticated, pSirMsg );
-#ifdef WLAN_SOFTAP_FEATURE
if(CSR_IS_INFRA_AP(&pSession->connectedProfile))
{
@@ -8679,7 +8589,6 @@
status = csrRoamCallCallback(pMac, sessionId, pRoamInfo, 0, eCSR_ROAM_INFRA_IND, eCSR_ROAM_RESULT_DEAUTH_IND);
}
-#endif
}
break;
@@ -8707,7 +8616,6 @@
case eWNI_SME_DEAUTH_RSP:
smsLog( pMac, LOGW, FL("eWNI_SME_DEAUTH_RSP from SME\n"));
-#ifdef WLAN_SOFTAP_FEATURE
{
tSirSmeDeauthRsp* pDeauthRsp = (tSirSmeDeauthRsp *)pSirMsg;
sessionId = pDeauthRsp->sessionId;
@@ -8730,13 +8638,11 @@
}
}
}
-#endif
break;
case eWNI_SME_DISASSOC_RSP:
/* session id is invalid here so cant use it to access the array curSubstate as index */
smsLog( pMac, LOGW, FL("eWNI_SME_DISASSOC_RSP from SME \n"));
-#ifdef WLAN_SOFTAP_FEATURE
{
tSirSmeDisassocRsp *pDisassocRsp = (tSirSmeDisassocRsp *)pSirMsg;
sessionId = pDisassocRsp->sessionId;
@@ -8759,7 +8665,6 @@
}
}
}
-#endif
break;
case eWNI_SME_MIC_FAILURE_IND:
{
@@ -8805,7 +8710,6 @@
}
}
break;
-#ifdef WLAN_SOFTAP_FEATURE
case eWNI_SME_WPS_PBC_PROBE_REQ_IND:
{
tpSirSmeProbeReqInd pProbeReqInd = (tpSirSmeProbeReqInd)pSirMsg;
@@ -8822,7 +8726,6 @@
}
}
break;
-#endif
case eWNI_SME_WM_STATUS_CHANGE_NTF:
pStatusChangeMsg = (tSirSmeWmStatusChangeNtf *)pSirMsg;
@@ -9717,9 +9620,7 @@
}
// call profile lost link routine here
-#ifdef WLAN_SOFTAP_FEATURE
if(!CSR_IS_INFRA_AP(&pSession->connectedProfile))
-#endif
{
csrRoamCallCallback(pMac, sessionId, NULL, 0, eCSR_ROAM_LOSTLINK_DETECTED, result);
}
@@ -9948,35 +9849,19 @@
//This function returns band and mode information.
//The only tricky part is that if phyMode is set to 11abg, this function may return eCSR_CFG_DOT11_MODE_11B
//instead of eCSR_CFG_DOT11_MODE_11G if everything is set to auto-pick.
-#ifdef WLAN_SOFTAP_FEATURE
static eCsrCfgDot11Mode csrRoamGetPhyModeBandForBss( tpAniSirGlobal pMac, tCsrRoamProfile *pProfile,
tANI_U8 operationChn, eCsrBand *pBand )
-#else
-static eCsrCfgDot11Mode csrRoamGetPhyModeBandForBss( tpAniSirGlobal pMac, eCsrPhyMode phyModeIn,
- tANI_U8 operationChn, eCsrBand *pBand )
-#endif
{
-#ifdef WLAN_SOFTAP_FEATURE
eCsrPhyMode phyModeIn = (eCsrPhyMode)pProfile->phyMode;
eCsrCfgDot11Mode cfgDot11Mode = csrGetCfgDot11ModeFromCsrPhyMode(pProfile, phyModeIn,
pMac->roam.configParam.ProprietaryRatesEnabled);
-#else
- eCsrCfgDot11Mode cfgDot11Mode = csrGetCfgDot11ModeFromCsrPhyMode(phyModeIn,
- pMac->roam.configParam.ProprietaryRatesEnabled);
-#endif
eCsrBand eBand;
//If the global setting for dot11Mode is set to auto/abg, we overwrite the setting in the profile.
-#ifdef WLAN_SOFTAP_FEATURE
if( ((!CSR_IS_INFRA_AP(pProfile )&& !CSR_IS_WDS(pProfile )) &&
((eCSR_CFG_DOT11_MODE_AUTO == pMac->roam.configParam.uCfgDot11Mode) ||
(eCSR_CFG_DOT11_MODE_ABG == pMac->roam.configParam.uCfgDot11Mode))) ||
(eCSR_CFG_DOT11_MODE_AUTO == cfgDot11Mode) || (eCSR_CFG_DOT11_MODE_ABG == cfgDot11Mode) )
-#else
- if( (eCSR_CFG_DOT11_MODE_AUTO == pMac->roam.configParam.uCfgDot11Mode) ||
- (eCSR_CFG_DOT11_MODE_ABG == pMac->roam.configParam.uCfgDot11Mode) ||
- (eCSR_CFG_DOT11_MODE_AUTO == cfgDot11Mode) || (eCSR_CFG_DOT11_MODE_ABG == cfgDot11Mode) )
-#endif
{
switch( pMac->roam.configParam.uCfgDot11Mode )
{
@@ -10510,11 +10395,7 @@
operationChannel = pProfile->ChannelInfo.ChannelList[0];
}
-#ifdef WLAN_SOFTAP_FEATURE
cfgDot11Mode = csrRoamGetPhyModeBandForBss( pMac, pProfile, operationChannel, &eBand );
-#else
- cfgDot11Mode = csrRoamGetPhyModeBandForBss( pMac, (eCsrPhyMode)pProfile->phyMode, operationChannel, &eBand );
-#endif
#ifdef WLAN_FEATURE_P2P
if( ( (pProfile->csrPersona == VOS_P2P_CLIENT_MODE) ||
@@ -10819,7 +10700,6 @@
pParam->nRSNIELength = (tANI_U16)pProfile->nRSNReqIELength;
pParam->pRSNIE = pProfile->pRSNReqIE;
-#ifdef WLAN_SOFTAP_FEATURE
pParam->privacy = pProfile->privacy;
pParam->fwdWPSPBCProbeReq = pProfile->fwdWPSPBCProbeReq;
pParam->authType = pProfile->csr80211AuthType;
@@ -10838,15 +10718,9 @@
pParam->obssProtEnabled = pProfile->obssProtEnabled;
pParam->ht_protection = pProfile->cfg_protection;
pParam->wps_state = pProfile->wps_state;
-#endif
-
-#ifdef WLAN_SOFTAP_FEATURE
+
pParam->uCfgDot11Mode = csrRoamGetPhyModeBandForBss(pMac, pProfile, pParam->operationChn /* pProfile->operationChannel*/,
&eBand);
-#else
- pParam->uCfgDot11Mode = csrRoamGetPhyModeBandForBss(pMac, (eCsrPhyMode)pProfile->phyMode, pProfile->operationChannel,
- &eBand);
-#endif
pParam->bssPersona = pProfile->csrPersona;
// When starting an IBSS, start on the channel from the Profile.
status = csrSendMBStartBssReqMsg( pMac, sessionId, pProfile->BSSType, pParam, pBssDesc );
@@ -12140,11 +12014,9 @@
tSirSmeDisassocReq *pMsg;
tANI_U8 *pBuf;
tANI_U16 wTmp;
-#ifdef WLAN_SOFTAP_FEATURE
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
if (!CSR_IS_SESSION_VALID( pMac, sessionId ))
return eHAL_STATUS_FAILURE;
-#endif
do {
status = palAllocateMemory(pMac->hHdd, (void **)&pMsg, sizeof( tSirSmeDisassocReq ));
if ( !HAL_STATUS_SUCCESS(status) ) break;
@@ -12159,7 +12031,6 @@
*( pBuf + 1 ) = 0;
pBuf += sizeof(tANI_U16);
-#ifdef WLAN_SOFTAP_FEATURE
if ( (pSession->pCurRoamProfile != NULL ) &&
( reasonCode == eSIR_MAC_UNSPEC_FAILURE_REASON ) &&
((CSR_IS_INFRA_AP(pSession->pCurRoamProfile)) || (CSR_IS_WDS_AP(pSession->pCurRoamProfile))))
@@ -12173,15 +12044,12 @@
}
else
{
-#endif
// Set the peer MAC address before sending the message to LIM
status = palCopyMemory( pMac->hHdd, (tSirMacAddr *)pBuf, bssId, sizeof( tSirMacAddr ) );
pBuf = pBuf + sizeof ( tSirMacAddr );
status = palCopyMemory( pMac->hHdd, (tSirMacAddr *)pBuf, bssId, sizeof( pMsg->bssId ) );
pBuf = pBuf + sizeof ( tSirMacAddr );
-#ifdef WLAN_SOFTAP_FEATURE
}
-#endif
if(!HAL_STATUS_SUCCESS(status))
{
palFreeMemory(pMac->hHdd, pMsg);
@@ -12211,7 +12079,6 @@
} while( 0 );
return( status );
}
-#ifdef WLAN_SOFTAP_FEATURE
eHalStatus csrSendMBTkipCounterMeasuresReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tANI_BOOLEAN bEnable, tSirMacAddr bssId )
{
eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -12365,7 +12232,6 @@
return status;
}
-#endif
eHalStatus csrSendMBDeauthReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirMacAddr bssId, tANI_U16 reasonCode )
{
eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -12390,9 +12256,7 @@
*(pBuf + 1 ) = 0;
pBuf += sizeof(tANI_U16);
if ((pSession->pCurRoamProfile != NULL) && (
-#ifdef WLAN_SOFTAP_FEATURE
(CSR_IS_INFRA_AP(pSession->pCurRoamProfile)) ||
-#endif
(CSR_IS_WDS_AP(pSession->pCurRoamProfile)))){
// Set the BSSID before sending the message to LIM
status = palCopyMemory( pMac->hHdd, (tSirMacAddr *)pBuf, pSession->selfMacAddr, sizeof( pMsg->peerMacAddr ) );
@@ -12530,7 +12394,6 @@
} while( 0 );
return( status );
}
-#ifdef WLAN_SOFTAP_FEATURE
eHalStatus csrSendAssocIndToUpperLayerCnfMsg( tpAniSirGlobal pMac,
tpSirSmeAssocInd pAssocInd,
eHalStatus Halstatus,
@@ -12595,7 +12458,6 @@
} while( 0 );
return( status );
}
-#endif
eHalStatus csrSendMBSetContextReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId ,
tSirMacAddr peerMacAddr, tANI_U8 numKeys, tAniEdType edType,
@@ -12704,9 +12566,7 @@
tANI_U32 dwTmp;
tSirNwType nwType;
ePhyChanBondState cbMode;
-#ifdef WLAN_SOFTAP_FEATURE
tANI_U32 authType;
-#endif
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
if(!pSession)
@@ -12743,12 +12603,10 @@
{
wTmp = pal_cpu_to_be16( pBssDesc->beaconInterval );
}
-#ifdef WLAN_SOFTAP_FEATURE
else if(pParam->beaconInterval)
{
wTmp = pal_cpu_to_be16( pParam->beaconInterval );
}
-#endif
else
{
wTmp = pal_cpu_to_be16( WNI_CFG_BEACON_INTERVAL_STADEF );
@@ -12800,7 +12658,6 @@
palCopyMemory( pMac->hHdd, pBuf, (tANI_U8 *)&cbMode, sizeof(ePhyChanBondState) );
pBuf += sizeof(ePhyChanBondState);
-#ifdef WLAN_SOFTAP_FEATURE
// Set privacy
*pBuf = pParam->privacy;
pBuf++;
@@ -12835,7 +12692,6 @@
// Set wps_state
*pBuf = pParam->wps_state;
pBuf++;
-#endif
//Persona
*pBuf = (tANI_U8)pParam->bssPersona;
pBuf++;
@@ -15032,7 +14888,6 @@
}
return ( status );
}
-#ifdef WLAN_SOFTAP_FEATURE
eHalStatus csrRoamUpdateAPWPSIE( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirAPWPSIEs* pAPWPSIES )
{
eHalStatus status = eHAL_STATUS_SUCCESS;
@@ -15110,7 +14965,6 @@
} while( 0 );
return ( status );
}
-#endif //#ifdef WLAN_SOFTAP_FEATURE
#ifdef WLAN_FEATURE_VOWIFI_11R
//eHalStatus csrRoamIssueFTPreauthReq(tHalHandle hHal, tANI_U32 sessionId, tCsrBssid preAuthBssid, tANI_U8 channelId)
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
old mode 100755
new mode 100644
index 96769ea..d42b05f
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -2376,7 +2376,6 @@
}
else
{
-#ifdef WLAN_SOFTAP_FEATURE
if(pMsg->type == eWNI_SME_UPPER_LAYER_ASSOC_CNF)
{
tCsrRoamSession *pSession;
@@ -2423,7 +2422,6 @@
}
else
-#endif
{
if( csrIsAnySessionInConnectState( pMac ) )
@@ -3611,10 +3609,8 @@
v_REGDOMAIN_t domainId;
tDot11fBeaconIEs *pIesLocal = pIes;
-#ifdef WLAN_SOFTAP_FEATURE
if (VOS_STA_SAP_MODE == vos_get_conparam ())
return eHAL_STATUS_SUCCESS;
-#endif
do
{
@@ -6202,11 +6198,9 @@
{
if(eANI_BOOLEAN_FALSE == pMac->scan.fCancelIdleScan)
{
-#ifdef WLAN_SOFTAP_FEATURE
if (vos_concurrent_sessions_running()) {
return;
}
-#endif
smsLog(pMac, LOG1, " csrScanCancelIdleScan\n");
pMac->scan.fCancelIdleScan = eANI_BOOLEAN_TRUE;
//Set the restart flag in case later on it is uncancelled
@@ -6857,11 +6851,7 @@
pChannelPowerSet->firstChanNum = (tSirMacChanNum)(pChannelSet->firstChannel + ( idx * pChannelSet->interChannelOffset ));
smsLog(pMac, LOG3, " Setting Channel Number %d\n", pChannelPowerSet->firstChanNum);
pChannelPowerSet->numChannels = 1;
-#ifdef WLAN_SOFTAP_FEATURE
pChannelPowerSet->maxTxPower = CSR_ROAM_MIN( pChannelSet->txPower, pMac->roam.configParam.nTxPowerCap );
-#else
- pChannelPowerSet->maxTxPower = pChannelSet->txPower;
-#endif
smsLog(pMac, LOG3, " Setting Max Transmit Power %d\n", pChannelPowerSet->maxTxPower);
cbLen += sizeof( tSirMacChanInfo );
pChannelPowerSet++;
@@ -6883,11 +6873,7 @@
pChannelPowerSet->firstChanNum = pChannelSet->firstChannel;
smsLog(pMac, LOG3, " Setting Channel Number %d\n", pChannelPowerSet->firstChanNum);
pChannelPowerSet->numChannels = pChannelSet->numChannels;
-#ifdef WLAN_SOFTAP_FEATURE
pChannelPowerSet->maxTxPower = CSR_ROAM_MIN( pChannelSet->txPower, pMac->roam.configParam.nTxPowerCap );
-#else
- pChannelPowerSet->maxTxPower = pChannelSet->txPower;
-#endif
smsLog(pMac, LOG3, " Setting Max Transmit Power %d, nTxPower %d\n", pChannelPowerSet->maxTxPower,pMac->roam.configParam.nTxPowerCap );
diff --git a/CORE/SME/src/csr/csrInsideApi.h b/CORE/SME/src/csr/csrInsideApi.h
old mode 100755
new mode 100644
index 288dde7..7eedaf5
--- a/CORE/SME/src/csr/csrInsideApi.h
+++ b/CORE/SME/src/csr/csrInsideApi.h
@@ -345,9 +345,7 @@
eHalStatus csrSendMBDisassocCnfMsg( tpAniSirGlobal pMac, tpSirSmeDisassocInd pDisassocInd );
eHalStatus csrSendMBDeauthCnfMsg( tpAniSirGlobal pMac, tpSirSmeDeauthInd pDeauthInd );
eHalStatus csrSendAssocCnfMsg( tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocInd, eHalStatus status );
-#ifdef WLAN_SOFTAP_FEATURE
eHalStatus csrSendAssocIndToUpperLayerCnfMsg( tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocInd, eHalStatus Halstatus, tANI_U8 sessionId );
-#endif
eHalStatus csrSendMBStartBssReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrRoamBssType bssType,
tCsrRoamStartBssParams *pParam, tSirBssDescription *pBssDesc );
eHalStatus csrSendMBStopBssReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId );
@@ -379,11 +377,7 @@
void csrReleaseProfile(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile);
//To free memory allocated inside scanFilter
void csrFreeScanFilter(tpAniSirGlobal pMac, tCsrScanResultFilter *pScanFilter);
-#ifdef WLAN_SOFTAP_FEATURE
eCsrCfgDot11Mode csrGetCfgDot11ModeFromCsrPhyMode(tCsrRoamProfile *pProfile, eCsrPhyMode phyMode, tANI_BOOLEAN fProprietary);
-#else
-eCsrCfgDot11Mode csrGetCfgDot11ModeFromCsrPhyMode(eCsrPhyMode phyMode, tANI_BOOLEAN fProprietary);
-#endif
tANI_U32 csrTranslateToWNICfgDot11Mode(tpAniSirGlobal pMac, eCsrCfgDot11Mode csrDot11Mode);
void csrSaveChannelPowerForBand( tpAniSirGlobal pMac, tANI_BOOLEAN fPopulate5GBand );
void csrApplyChannelPowerCountryInfo( tpAniSirGlobal pMac, tCsrChannel *pChannelList, tANI_U8 *countryCode, tANI_BOOLEAN updateRiva);
@@ -866,7 +860,6 @@
void csrCallRoamingCompletionCallback(tpAniSirGlobal pMac, tCsrRoamSession *pSession,
tCsrRoamInfo *pRoamInfo, tANI_U32 roamId, eCsrRoamResult roamResult);
-#ifdef WLAN_SOFTAP_FEATURE
/* ---------------------------------------------------------------------------
\fn csrRoamIssueDisassociateStaCmd
\brief csr function that HDD calls to disassociate a associated station
@@ -944,7 +937,6 @@
eHalStatus
csrSendChngMCCBeaconInterval(tpAniSirGlobal pMac, tANI_U32 sessionId);
-#endif
#ifdef FEATURE_WLAN_BTAMP_UT_RF
eHalStatus csrRoamStartJoinRetryTimer(tpAniSirGlobal pMac, tANI_U32 sessionId, tANI_U32 interval);
eHalStatus csrRoamStopJoinRetryTimer(tpAniSirGlobal pMac, tANI_U32 sessionId);
diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c
index b8ad98e..7888b28 100644
--- a/CORE/SME/src/csr/csrUtil.c
+++ b/CORE/SME/src/csr/csrUtil.c
@@ -1370,13 +1370,11 @@
return( eCSR_ASSOC_STATE_TYPE_WDS_CONNECTED == pMac->roam.roamSession[sessionId].connectState );
}
-#ifdef WLAN_SOFTAP_FEATURE
tANI_BOOLEAN csrIsConnStateConnectedInfraAp( tpAniSirGlobal pMac, tANI_U32 sessionId )
{
return( (eCSR_ASSOC_STATE_TYPE_INFRA_CONNECTED == pMac->roam.roamSession[sessionId].connectState) ||
(eCSR_ASSOC_STATE_TYPE_INFRA_DISCONNECTED == pMac->roam.roamSession[sessionId].connectState ) );
}
-#endif
tANI_BOOLEAN csrIsConnStateDisconnectedWds( tpAniSirGlobal pMac, tANI_U32 sessionId )
{
@@ -2240,14 +2238,12 @@
case eCSR_CFG_DOT11_MODE_TITAN:
ret = WNI_CFG_DOT11_MODE_TITAN;
break;
-#ifdef WLAN_SOFTAP_FEATURE
case eCSR_CFG_DOT11_MODE_11G_ONLY:
ret = WNI_CFG_DOT11_MODE_11G_ONLY;
break;
case eCSR_CFG_DOT11_MODE_11N_ONLY:
ret = WNI_CFG_DOT11_MODE_11N_ONLY;
break;
-#endif
#ifdef WLAN_FEATURE_11AC
case eCSR_CFG_DOT11_MODE_11AC_ONLY:
@@ -5937,11 +5933,9 @@
case eCSR_BSS_TYPE_WDS_STA:
ret = eSIR_BTAMP_STA_MODE;
break;
-#ifdef WLAN_SOFTAP_FEATURE
case eCSR_BSS_TYPE_INFRA_AP:
ret = eSIR_INFRA_AP_MODE;
break;
-#endif
case eCSR_BSS_TYPE_ANY:
default:
ret = eSIR_AUTO_MODE;
@@ -5955,11 +5949,7 @@
//This function use the parameters to decide the CFG value.
//CSR never sets WNI_CFG_DOT11_MODE_ALL to the CFG
//So PE should not see WNI_CFG_DOT11_MODE_ALL when it gets the CFG value
-#ifdef WLAN_SOFTAP_FEATURE
eCsrCfgDot11Mode csrGetCfgDot11ModeFromCsrPhyMode(tCsrRoamProfile *pProfile, eCsrPhyMode phyMode, tANI_BOOLEAN fProprietary)
-#else
-eCsrCfgDot11Mode csrGetCfgDot11ModeFromCsrPhyMode(eCsrPhyMode phyMode, tANI_BOOLEAN fProprietary)
-#endif
{
tANI_U32 cfgDot11Mode = eCSR_CFG_DOT11_MODE_ABG;
@@ -5975,11 +5965,9 @@
break;
case eCSR_DOT11_MODE_11g:
case eCSR_DOT11_MODE_11g_ONLY:
-#ifdef WLAN_SOFTAP_FEATURE
if(pProfile && (CSR_IS_INFRA_AP(pProfile)) && (phyMode == eCSR_DOT11_MODE_11g_ONLY))
cfgDot11Mode = eCSR_CFG_DOT11_MODE_11G_ONLY;
else
-#endif
cfgDot11Mode = eCSR_CFG_DOT11_MODE_11G;
break;
case eCSR_DOT11_MODE_11n:
@@ -5993,11 +5981,9 @@
}
break;
case eCSR_DOT11_MODE_11n_ONLY:
-#ifdef WLAN_SOFTAP_FEATURE
if(pProfile && CSR_IS_INFRA_AP(pProfile))
cfgDot11Mode = eCSR_CFG_DOT11_MODE_11N_ONLY;
else
-#endif
cfgDot11Mode = eCSR_CFG_DOT11_MODE_11N;
break;
case eCSR_DOT11_MODE_TAURUS:
@@ -6436,7 +6422,6 @@
tANI_BOOLEAN csrIsSetKeyAllowed(tpAniSirGlobal pMac, tANI_U32 sessionId)
{
tANI_BOOLEAN fRet = eANI_BOOLEAN_TRUE;
-#ifdef WLAN_SOFTAP_FEATURE
tCsrRoamSession *pSession;
pSession =CSR_GET_SESSION(pMac, sessionId);
@@ -6457,9 +6442,6 @@
{
fRet = eANI_BOOLEAN_FALSE;
}
-#else
- fRet = !( csrIsConnStateDisconnected( pMac, sessionId ) );
-#endif
return ( fRet );
}
diff --git a/CORE/SME/src/oemData/oemDataApi.c b/CORE/SME/src/oemData/oemDataApi.c
index c6ac6b0..6e77a6d 100644
--- a/CORE/SME/src/oemData/oemDataApi.c
+++ b/CORE/SME/src/oemData/oemDataApi.c
@@ -397,9 +397,7 @@
if(CSR_IS_SESSION_VALID(pMac, sessionId))
{
if(csrIsConnStateIbss(pMac, sessionId) || csrIsBTAMP(pMac, sessionId)
-#ifdef WLAN_SOFTAP_FEATURE
|| csrIsConnStateConnectedInfraAp(pMac, sessionId)
-#endif
)
{
//co-exist with IBSS or BT-AMP or Soft-AP mode is not supported
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
old mode 100755
new mode 100644
index 321458c..e59d3c9
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -81,9 +81,7 @@
#include "wlan_qct_wda.h"
#include "halMsgApi.h"
-#ifdef WLAN_SOFTAP_FEATURE
#include "sapApi.h"
-#endif
@@ -958,7 +956,6 @@
if(!HAL_STATUS_SUCCESS((status = initSmeCmdList(pMac))))
break;
-#ifdef WLAN_SOFTAP_FEATURE
{
v_PVOID_t pvosGCtx = vos_get_global_context(VOS_MODULE_ID_SAP, NULL);
if ( NULL == pvosGCtx ){
@@ -974,7 +971,6 @@
break;
}
}
-#endif
#if defined WLAN_FEATURE_VOWIFI
status = rrmOpen(pMac);
if ( ! HAL_STATUS_SUCCESS( status ) ) {
@@ -996,7 +992,6 @@
return status;
}
-#ifdef WLAN_SOFTAP_FEATURE
/*--------------------------------------------------------------------------
\brief sme_set11dinfo() - Set the 11d information about valid channels
@@ -1084,7 +1079,6 @@
return status;
}
-#endif
#ifdef FEATURE_WLAN_SCAN_PNO
/*--------------------------------------------------------------------------
@@ -1351,14 +1345,12 @@
break;
}
-#ifdef WLAN_SOFTAP_FEATURE
status = WLANSAP_Start(vos_get_global_context(VOS_MODULE_ID_SAP, NULL));
if ( ! HAL_STATUS_SUCCESS( status ) ) {
smsLog( pMac, LOGE, "WLANSAP_Start failed during smeStart with status=%d\n",
status );
break;
}
-#endif
pMac->sme.state = SME_STATE_START;
}while (0);
@@ -1812,14 +1804,12 @@
eHalStatus fail_status = eHAL_STATUS_SUCCESS;
tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
-#ifdef WLAN_SOFTAP_FEATURE
status = WLANSAP_Stop(vos_get_global_context(VOS_MODULE_ID_SAP, NULL));
if ( ! HAL_STATUS_SUCCESS( status ) ) {
smsLog( pMac, LOGE, "WLANSAP_Stop failed during smeStop with status=%d\n",
status );
fail_status = status;
}
-#endif
p2pStop(hHal);
@@ -1885,14 +1875,12 @@
fail_status = status;
}
-#ifdef WLAN_SOFTAP_FEATURE
status = WLANSAP_Close(vos_get_global_context(VOS_MODULE_ID_SAP, NULL));
if ( ! HAL_STATUS_SUCCESS( status ) ) {
smsLog( pMac, LOGE, "WLANSAP_close failed during sme close with status=%d\n",
status );
fail_status = status;
}
-#endif
#ifndef WLAN_MDM_CODE_REDUCTION_OPT
status = btcClose(hHal);
@@ -2444,7 +2432,6 @@
return (status);
}
-#ifdef WLAN_SOFTAP_FEATURE
/* ---------------------------------------------------------------------------
\fn sme_RoamStopBss
\brief To stop BSS for Soft AP. This is an asynchronous API.
@@ -2669,7 +2656,6 @@
return (status);
}
-#endif
/* ---------------------------------------------------------------------------
\fn sme_RoamGetConnectState
@@ -3733,10 +3719,8 @@
eHalStatus status = eHAL_STATUS_FAILURE;
tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
tANI_U32 roamId;
-#ifdef WLAN_SOFTAP_FEATURE
tANI_U32 i;
tCsrRoamSession *pSession = NULL;
-#endif
status = sme_AcquireGlobalLock( &pMac->sme );
if ( HAL_STATUS_SUCCESS( status ) )
@@ -3747,7 +3731,6 @@
*pRoamId = roamId;
}
-#ifdef WLAN_SOFTAP_FEATURE
smsLog(pMac, LOG2, FL("keyLength\n"), pSetKey->keyLength);
for(i=0; i<pSetKey->keyLength; i++)
@@ -3779,7 +3762,6 @@
}
}
}
-#endif
status = csrRoamSetKey ( pMac, sessionId, pSetKey, roamId );
sme_ReleaseGlobalLock( &pMac->sme );
@@ -5033,7 +5015,6 @@
return ( status );
}
-#ifdef WLAN_SOFTAP_FEATURE
/* ---------------------------------------------------------------------------
\fn sme_RoamUpdateAPWPSIE
@@ -5096,7 +5077,6 @@
return (status);
}
-#endif
/* ---------------------------------------------------------------------------
\fn sme_ChangeMCCBeaconInterval
@@ -5368,9 +5348,7 @@
if(( pSession->connectedProfile.BSSType == eCSR_BSS_TYPE_INFRASTRUCTURE ) ||
( pSession->connectedProfile.BSSType == eCSR_BSS_TYPE_IBSS ) ||
-#ifdef WLAN_SOFTAP_FEATURE
( pSession->connectedProfile.BSSType == eCSR_BSS_TYPE_INFRA_AP ) ||
-#endif
( pSession->connectedProfile.BSSType == eCSR_BSS_TYPE_START_IBSS ))
{
*pChannel =pSession->connectedProfile.operationChannel;
@@ -6594,7 +6572,6 @@
return eHAL_STATUS_SUCCESS;
}
-#ifdef WLAN_SOFTAP_FEATURE
/* ---------------------------------------------------------------------------
\fn sme_HideSSID
@@ -6645,7 +6622,6 @@
}
return status;
}
-#endif
/* ---------------------------------------------------------------------------