wlan: Compilation error fix in sapModule.c, sapFsm.c
Change-Id: I3f3aec65d8a76763c6ddea2ef79367f4eb2d93aa
CRs-Fixed: NA
diff --git a/CORE/SAP/src/sapFsm.c b/CORE/SAP/src/sapFsm.c
index d4490df..646bba4 100644
--- a/CORE/SAP/src/sapFsm.c
+++ b/CORE/SAP/src/sapFsm.c
@@ -26,13 +26,13 @@
OVERVIEW:
This software unit holds the implementation of the WLAN SAP Finite
- State Machine modules
+ State Machine modules
- DEPENDENCIES:
+ DEPENDENCIES:
- Are listed for each API below.
+ Are listed for each API below.
-
+
Copyright (c) 2010 QUALCOMM Incorporated.
All Rights Reserved.
Qualcomm Confidential and Proprietary
@@ -78,7 +78,7 @@
* -------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------
- * External declarations for global context
+ * External declarations for global context
* -------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------
@@ -89,7 +89,7 @@
* Static Function Declarations and Definitions
* -------------------------------------------------------------------------*/
#ifdef SOFTAP_CHANNEL_RANGE
-static VOS_STATUS sapGetChannelList(ptSapContext sapContext, v_U8_t **channelList,
+static VOS_STATUS sapGetChannelList(ptSapContext sapContext, v_U8_t **channelList,
v_U8_t *numberOfChannels);
#endif
/*----------------------------------------------------------------------------
@@ -103,22 +103,22 @@
/*==========================================================================
FUNCTION sapEventInit
- DESCRIPTION
+ DESCRIPTION
Function for initializing sWLAN_SAPEvent structure
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
- PARAMETERS
+ PARAMETERS
IN
sapEvent : State machine event
-
+
RETURN VALUE
None
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
static inline void sapEventInit(ptWLAN_SAPEvent sapEvent)
{
@@ -131,24 +131,24 @@
/*==========================================================================
FUNCTION sapGotoChannelSel
- DESCRIPTION
- Function for initiating scan request for SME
+ DESCRIPTION
+ Function for initiating scan request for SME
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
- PARAMETERS
+ PARAMETERS
IN
sapContext : Sap Context value
sapEvent : State machine event
-
+
RETURN VALUE
The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
VOS_STATUS
sapGotoChannelSel
@@ -185,13 +185,13 @@
channel = sme_GetConcurrentOperationChannel(hHal);
if (channel)
- { /*if a valid channel is returned then use concurrent channel.
+ { /*if a valid channel is returned then use concurrent channel.
Else take whatever comes from configuartion*/
sapContext->channel = channel;
}
}
-
- if (sapContext->channel == AUTO_CHANNEL_SELECT)
+
+ if (sapContext->channel == AUTO_CHANNEL_SELECT)
{
vos_mem_zero(&scanRequest, sizeof(scanRequest));
@@ -204,8 +204,8 @@
/* Set BSSType to default type */
scanRequest.BSSType = eCSR_BSS_TYPE_ANY;
-
-#ifndef SOFTAP_CHANNEL_RANGE
+
+#ifndef SOFTAP_CHANNEL_RANGE
/*Scan all the channels */
scanRequest.ChannelInfo.numOfChannels = 0;
@@ -219,13 +219,13 @@
/*Scan the channels in the list*/
scanRequest.ChannelInfo.numOfChannels = numOfChannels;
-
+
scanRequest.ChannelInfo.ChannelList = channelList;
scanRequest.requestType = eCSR_SCAN_SOFTAP_CHANNEL_RANGE;
sapContext->channelList = channelList;
-
+
#endif
/* Set requestType to Full scan */
@@ -264,7 +264,7 @@
}
}
- else
+ else
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, for configured channel, Ch= %d", __FUNCTION__, sapContext->channel);
/* Fill in the event structure */
@@ -284,13 +284,13 @@
/*==========================================================================
FUNCTION sapGotoStarting
- DESCRIPTION
+ DESCRIPTION
Function for initiating start bss request for SME
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
- PARAMETERS
+ PARAMETERS
IN
sapContext : Sap Context value
@@ -302,27 +302,27 @@
The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
VOS_STATUS
sapGotoStarting
-(
+(
ptSapContext sapContext,
ptWLAN_SAPEvent sapEvent,
eCsrRoamBssType bssType
)
{
- /* tHalHandle */
+ /* tHalHandle */
tHalHandle hHal = VOS_GET_HAL_CB(sapContext->pvosGCtx);
eHalStatus halStatus;
-
+
/*- - - - - - - - TODO:once configs from hdd available - - - - - - - - -*/
- char key_material[32]={ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1,};
+ char key_material[32]={ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1,};
sapContext->key_type = 0x05;
sapContext->key_length = 32;
vos_mem_copy(sapContext->key_material, key_material, sizeof(key_material)); /* Need a key size define */
-
+
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s", __FUNCTION__);
if (NULL == hHal)
{
@@ -333,16 +333,16 @@
}
//TODO: What shall we do if failure????
- halStatus = pmcRequestFullPower( hHal,
- WLANSAP_pmcFullPwrReqCB,
+ halStatus = pmcRequestFullPower( hHal,
+ WLANSAP_pmcFullPwrReqCB,
sapContext,
eSME_REASON_OTHER);
/* Open SME Session for Softap */
halStatus = sme_OpenSession(hHal,
- &WLANSAP_RoamCallback,
+ &WLANSAP_RoamCallback,
sapContext,
- sapContext->self_mac_addr,
+ sapContext->self_mac_addr,
&sapContext->sessionId);
if(eHAL_STATUS_SUCCESS != halStatus )
@@ -357,24 +357,24 @@
/*==========================================================================
FUNCTION sapGotoDisconnecting
- DESCRIPTION
+ DESCRIPTION
Processing of SAP FSM Disconnecting state
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
- PARAMETERS
+ PARAMETERS
IN
sapContext : Sap Context value
status : Return the SAP status here
-
+
RETURN VALUE
The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
VOS_STATUS
sapGotoDisconnecting
@@ -408,20 +408,20 @@
static eHalStatus sapRoamSessionCloseCallback(void *pContext)
{
ptSapContext sapContext = (ptSapContext)pContext;
- return sapSignalHDDevent(sapContext, NULL,
+ return sapSignalHDDevent(sapContext, NULL,
eSAP_STOP_BSS_EVENT, (v_PVOID_t) eSAP_STATUS_SUCCESS);
}
/*==========================================================================
FUNCTION sapGotoDisconnected
- DESCRIPTION
+ DESCRIPTION
Function for setting the SAP FSM to Disconnection state
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
- PARAMETERS
+ PARAMETERS
IN
sapContext : Sap Context value
@@ -432,8 +432,8 @@
The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
VOS_STATUS
sapGotoDisconnected
@@ -451,37 +451,37 @@
sapEvent.u2 = 0;
/* Handle event */
vosStatus = sapFsm(sapContext, &sapEvent);
-
+
return vosStatus;
}
/*==========================================================================
FUNCTION sapSignalHDDevent
- DESCRIPTION
+ DESCRIPTION
Function for HDD to send the event notification using callback
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
- PARAMETERS
+ PARAMETERS
IN
sapContext : Sap Context value
pCsrRoamInfo : Pointer to CSR roam information
sapHddevent : SAP HDD event
- context : to pass the element for future support
-
+ context : to pass the element for future support
+
RETURN VALUE
The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
VOS_STATUS
-sapSignalHDDevent
-(
+sapSignalHDDevent
+(
ptSapContext sapContext, /* sapContext value */
tCsrRoamInfo *pCsrRoamInfo,
eSapHddEvent sapHddevent,
@@ -516,7 +516,7 @@
sapApAppEvent.sapevt.sapAssocIndication.negotiatedUCEncryptionType = pCsrRoamInfo->u.pConnectedProfile->EncryptionType;
sapApAppEvent.sapevt.sapAssocIndication.negotiatedMCEncryptionType = pCsrRoamInfo->u.pConnectedProfile->mcEncryptionType;
sapApAppEvent.sapevt.sapAssocIndication.fAuthRequired = pCsrRoamInfo->fAuthRequired;
- }
+ }
break;
case eSAP_START_BSS_EVENT:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
@@ -527,7 +527,7 @@
sapApAppEvent.sapevt.sapStartBssCompleteEvent.staId = pCsrRoamInfo->staId;
}
else
- sapApAppEvent.sapevt.sapStartBssCompleteEvent.staId = 0;
+ sapApAppEvent.sapevt.sapStartBssCompleteEvent.staId = 0;
sapApAppEvent.sapevt.sapStartBssCompleteEvent.operatingChannel = (v_U8_t)sapContext->channel;
break;
@@ -549,26 +549,26 @@
//TODO: Need to fill the SET KEY information and pass to HDD
vos_mem_copy( &sapApAppEvent.sapevt.sapStationAssocReassocCompleteEvent.staMac,
- pCsrRoamInfo->peerMac,sizeof(tSirMacAddr));
- sapApAppEvent.sapevt.sapStationAssocReassocCompleteEvent.staId = pCsrRoamInfo->staId ;
+ pCsrRoamInfo->peerMac,sizeof(tSirMacAddr));
+ sapApAppEvent.sapevt.sapStationAssocReassocCompleteEvent.staId = pCsrRoamInfo->staId ;
sapApAppEvent.sapevt.sapStationAssocReassocCompleteEvent.statusCode = pCsrRoamInfo->statusCode;
sapApAppEvent.sapevt.sapStationAssocReassocCompleteEvent.iesLen = pCsrRoamInfo->rsnIELen;
- vos_mem_copy(sapApAppEvent.sapevt.sapStationAssocReassocCompleteEvent.ies, pCsrRoamInfo->prsnIE,
+ vos_mem_copy(sapApAppEvent.sapevt.sapStationAssocReassocCompleteEvent.ies, pCsrRoamInfo->prsnIE,
pCsrRoamInfo->rsnIELen);
-
- if(pCsrRoamInfo->addIELen)
+
+ if(pCsrRoamInfo->addIELen)
{
v_U8_t len = sapApAppEvent.sapevt.sapStationAssocReassocCompleteEvent.iesLen;
- sapApAppEvent.sapevt.sapStationAssocReassocCompleteEvent.iesLen
+ sapApAppEvent.sapevt.sapStationAssocReassocCompleteEvent.iesLen
+= pCsrRoamInfo->addIELen;
- vos_mem_copy(&sapApAppEvent.sapevt.sapStationAssocReassocCompleteEvent.ies[len], pCsrRoamInfo->paddIE,
+ vos_mem_copy(&sapApAppEvent.sapevt.sapStationAssocReassocCompleteEvent.ies[len], pCsrRoamInfo->paddIE,
pCsrRoamInfo->addIELen);
}
sapApAppEvent.sapevt.sapStationAssocReassocCompleteEvent.wmmEnabled = pCsrRoamInfo->wmmEnabledSta;
sapApAppEvent.sapevt.sapStationAssocReassocCompleteEvent.status = (eSapStatus )context;
//TODO: Need to fill sapAuthType
- //sapApAppEvent.sapevt.sapStationAssocReassocCompleteEvent.SapAuthType = pCsrRoamInfo->pProfile->negotiatedAuthType;
+ //sapApAppEvent.sapevt.sapStationAssocReassocCompleteEvent.SapAuthType = pCsrRoamInfo->pProfile->negotiatedAuthType;
break;
}
@@ -576,9 +576,9 @@
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
__FUNCTION__, "eSAP_STA_DISASSOC_EVENT");
sapApAppEvent.sapHddEventCode = eSAP_STA_DISASSOC_EVENT;
-
+
vos_mem_copy( &sapApAppEvent.sapevt.sapStationDisassocCompleteEvent.staMac,
- pCsrRoamInfo->peerMac, sizeof(tSirMacAddr));
+ pCsrRoamInfo->peerMac, sizeof(tSirMacAddr));
sapApAppEvent.sapevt.sapStationDisassocCompleteEvent.staId = pCsrRoamInfo->staId;
if (pCsrRoamInfo->reasonCode == eCSR_ROAM_RESULT_FORCED)
sapApAppEvent.sapevt.sapStationDisassocCompleteEvent.reason = eSAP_USR_INITATED_DISASSOC;
@@ -626,19 +626,19 @@
vos_mem_copy( sapApAppEvent.sapevt.sapStationMICFailureEvent.TSC,
pCsrRoamInfo->u.pMICFailureInfo->TSC,
SIR_CIPHER_SEQ_CTR_SIZE);
- break;
+ break;
case eSAP_ASSOC_STA_CALLBACK_EVENT:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
__FUNCTION__, "eSAP_ASSOC_STA_CALLBACK_EVENT");
break;
-
+
case eSAP_WPS_PBC_PROBE_REQ_EVENT:
sapApAppEvent.sapHddEventCode = eSAP_WPS_PBC_PROBE_REQ_EVENT;
-
+
vos_mem_copy( &sapApAppEvent.sapevt.sapPBCProbeReqEvent.WPSPBCProbeReq,
pCsrRoamInfo->u.pWPSPBCProbeReq,
- sizeof(tSirWPSPBCProbeReq));
+ sizeof(tSirWPSPBCProbeReq));
break;
#ifdef WLAN_FEATURE_P2P
@@ -668,7 +668,7 @@
"In %s, SAP event callback event = %s",
__FUNCTION__, "eSAP_SEND_ACTION_CNF");
sapApAppEvent.sapHddEventCode = eSAP_SEND_ACTION_CNF;
- sapApAppEvent.sapevt.sapActionCnf.actionSendSuccess = (eSapStatus)context;
+ sapApAppEvent.sapevt.sapActionCnf.actionSendSuccess = (eSapStatus)context;
break;
#endif
@@ -677,7 +677,7 @@
"In %s, SAP event callback event = %s",
__FUNCTION__, "eSAP_UNKNOWN_STA_JOIN");
sapApAppEvent.sapHddEventCode = eSAP_UNKNOWN_STA_JOIN;
- vos_mem_copy((v_PVOID_t)sapApAppEvent.sapevt.sapUnknownSTAJoin.macaddr.bytes,
+ vos_mem_copy((v_PVOID_t)sapApAppEvent.sapevt.sapUnknownSTAJoin.macaddr.bytes,
(v_PVOID_t)context, sizeof(v_MACADDR_t));
break;
@@ -686,7 +686,7 @@
"In %s, SAP event callback event = %s",
__FUNCTION__, "eSAP_MAX_ASSOC_EXCEEDED");
sapApAppEvent.sapHddEventCode = eSAP_MAX_ASSOC_EXCEEDED;
- vos_mem_copy((v_PVOID_t)sapApAppEvent.sapevt.sapMaxAssocExceeded.macaddr.bytes,
+ vos_mem_copy((v_PVOID_t)sapApAppEvent.sapevt.sapMaxAssocExceeded.macaddr.bytes,
(v_PVOID_t)pCsrRoamInfo->peerMac, sizeof(v_MACADDR_t));
break;
@@ -700,7 +700,7 @@
&sapApAppEvent,
sapContext->pUsrContext//userdataforcallback - hdd opaque handle
);
-
+
return vosStatus;
} /* sapSignalApAppStartBssEvent */
@@ -708,34 +708,34 @@
/*==========================================================================
FUNCTION sapFsm
- DESCRIPTION
+ DESCRIPTION
SAP State machine entry function
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
- PARAMETERS
+ PARAMETERS
IN
sapContext : Sap Context value
sapEvent : State machine event
status : Return the SAP status here
-
+
RETURN VALUE
The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
VOS_STATUS
sapFsm
(
- ptSapContext sapContext, /* sapContext value */
+ ptSapContext sapContext, /* sapContext value */
ptWLAN_SAPEvent sapEvent /* State machine event */
)
{
- /* Retrieve the phy link state machine structure
+ /* Retrieve the phy link state machine structure
* from the sapContext value
*/
eSapFsmStates_t stateVar = sapContext->sapsMachine; /*state var that keeps track of state machine*/
@@ -753,7 +753,7 @@
__FUNCTION__, "eSAP_DISCONNECTED", "eSAP_CH_SELECT");
/* There can be one SAP Session for softap */
- if (sapContext->isSapSessionOpen == eSAP_TRUE)
+ if (sapContext->isSapSessionOpen == eSAP_TRUE)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_FATAL,
"%s:SME Session is already opened\n",__FUNCTION__);
@@ -767,12 +767,12 @@
/* Perform sme_ScanRequest */
vosStatus = sapGotoChannelSel(sapContext, sapEvent);
-
+
/* Transition from eSAP_DISCONNECTED to eSAP_CH_SELECT (both without substates) */
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s",
__FUNCTION__, "eSAP_DISCONNECTED", "eSAP_CH_SELECT");
- }
- else
+ }
+ else
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "In %s, in state %s, event msg %d",
__FUNCTION__, "eSAP_DISCONNECTED", msg);
@@ -780,7 +780,7 @@
break;
case eSAP_CH_SELECT:
- if (msg == eSAP_MAC_SCAN_COMPLETE)
+ if (msg == eSAP_MAC_SCAN_COMPLETE)
{
/* Transition from eSAP_CH_SELECT to eSAP_STARTING (both without substates) */
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s",
@@ -804,7 +804,7 @@
break;
case eSAP_STARTING:
- if (msg == eSAP_MAC_START_BSS_SUCCESS )
+ if (msg == eSAP_MAC_START_BSS_SUCCESS )
{
/* Transition from eSAP_STARTING to eSAP_STARTED (both without substates) */
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state channel = %d %s => %s",
@@ -818,12 +818,12 @@
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s",
__FUNCTION__, "eSAP_STARTING", "eSAP_STARTED");
}
- else if (msg == eSAP_MAC_START_FAILS)
+ else if (msg == eSAP_MAC_START_FAILS)
{
- /*Transition from STARTING to DISCONNECTED (both without substates)*/
+ /*Transition from STARTING to DISCONNECTED (both without substates)*/
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s",
__FUNCTION__, "eSAP_STARTING", "eSAP_DISCONNECTED");
-
+
/*Action code for transition */
vosStatus = sapSignalHDDevent( sapContext, NULL, eSAP_START_BSS_EVENT,(v_PVOID_t) eSAP_STATUS_FAILURE);
vosStatus = sapGotoDisconnected(sapContext);
@@ -833,7 +833,7 @@
}
else if (msg == eSAP_HDD_STOP_INFRA_BSS)
{
- /*Transition from eSAP_STARTING to eSAP_DISCONNECTING (both without substates)*/
+ /*Transition from eSAP_STARTING to eSAP_DISCONNECTING (both without substates)*/
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s",
__FUNCTION__, "eSAP_STARTING", "eSAP_DISCONNECTING");
@@ -843,7 +843,7 @@
vosStatus = sapGotoDisconnected(sapContext);
/* Close the SME session*/
- if (eSAP_TRUE == sapContext->isSapSessionOpen)
+ if (eSAP_TRUE == sapContext->isSapSessionOpen)
{
tHalHandle hHal = VOS_GET_HAL_CB(sapContext->pvosGCtx);
if (NULL == hHal)
@@ -852,7 +852,7 @@
"In %s, NULL hHal in state %s, msg %d",
__FUNCTION__, "eSAP_STARTING", msg);
}
- else if (eHAL_STATUS_SUCCESS ==
+ else if (eHAL_STATUS_SUCCESS ==
sme_CloseSession(hHal,
sapContext->sessionId, NULL, NULL))
{
@@ -860,7 +860,7 @@
}
}
}
- else
+ else
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"In %s, in state %s, invalid event msg %d",
@@ -894,7 +894,7 @@
sapContext->sapsMachine = eSAP_DISCONNECTED;
/* Close the SME session*/
- if (eSAP_TRUE == sapContext->isSapSessionOpen)
+ if (eSAP_TRUE == sapContext->isSapSessionOpen)
{
tHalHandle hHal = VOS_GET_HAL_CB(sapContext->pvosGCtx);
@@ -913,15 +913,15 @@
sapRoamSessionCloseCallback, sapContext)))
{
vosStatus = sapSignalHDDevent(sapContext, NULL,
- eSAP_STOP_BSS_EVENT,
+ eSAP_STOP_BSS_EVENT,
(v_PVOID_t) eSAP_STATUS_SUCCESS);
}
}
}
}
- else
+ else
{
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"In %s, in state %s, invalid event msg %d",
__FUNCTION__, "eSAP_DISCONNECTING", msg);
}
@@ -939,7 +939,7 @@
profile->SSIDs.numOfSSIDs = 1;
profile->csrPersona = pconfig_params->persona;
- vos_mem_zero(profile->SSIDs.SSIDList[0].SSID.ssId,
+ vos_mem_zero(profile->SSIDs.SSIDList[0].SSID.ssId,
sizeof(profile->SSIDs.SSIDList[0].SSID.ssId));
//Flag to not broadcast the SSID information
@@ -992,16 +992,16 @@
}
else
{
- profile->csr80211AuthType = eSIR_AUTO_SWITCH;
+ profile->csr80211AuthType = eSIR_AUTO_SWITCH;
}
- //Initialize we are not going to use it
+ //Initialize we are not going to use it
profile->pWPAReqIE = NULL;
profile->nWPAReqIELength = 0;
//set the RSN/WPA IE
profile->pRSNReqIE = NULL;
- profile->nRSNReqIELength = pconfig_params->RSNWPAReqIELength;
+ profile->nRSNReqIELength = pconfig_params->RSNWPAReqIELength;
if (pconfig_params->RSNWPAReqIELength)
{
profile->pRSNReqIE = vos_mem_malloc(pconfig_params->RSNWPAReqIELength);
@@ -1011,7 +1011,7 @@
return eSAP_STATUS_FAILURE;
}
vos_mem_copy(profile->pRSNReqIE, pconfig_params->pRSNWPAReqIE, pconfig_params->RSNWPAReqIELength);
- profile->nRSNReqIELength = pconfig_params->RSNWPAReqIELength;
+ profile->nRSNReqIELength = pconfig_params->RSNWPAReqIELength;
}
// Turn off CB mode
@@ -1037,7 +1037,7 @@
//country code
if (pconfig_params->countryCode[0])
- vos_mem_copy(profile->countryCode, pconfig_params->countryCode, WNI_CFG_COUNTRY_CODE_LEN);
+ vos_mem_copy(profile->countryCode, pconfig_params->countryCode, WNI_CFG_COUNTRY_CODE_LEN);
#ifdef WLAN_SOFTAP_FEATURE
profile->ieee80211d = pconfig_params->ieee80211d;
#endif
@@ -1098,7 +1098,7 @@
"search SUCC");
// "index equals NULL" means the caller does not need the
// index value of the peerMac being searched
- if (index != NULL)
+ if (index != NULL)
{
*index = (v_U8_t) nMiddle;
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
@@ -1144,7 +1144,7 @@
}
void
-sapRemoveMacFromACL(v_MACADDR_t *macList, v_U8_t *size, v_U8_t index)
+sapRemoveMacFromACL(v_MACADDR_t *macList, v_U8_t *size, v_U8_t index)
{
int i;
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,"remove acl entered");
@@ -1167,12 +1167,12 @@
void sapPrintACL(v_MACADDR_t *macList, v_U8_t size)
{
int i;
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,"print acl entered");
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,"print acl entered");
if (size==0) return;
for (i=0; i<size; i++)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "** ACL entry %i - %02x:%02x:%02x:%02x:%02x:%02x", i,
+ "** ACL entry %i - %02x:%02x:%02x:%02x:%02x:%02x", i,
(macList+i)->bytes[0], (macList+i)->bytes[1], (macList+i)->bytes[2],
(macList+i)->bytes[3], (macList+i)->bytes[4], (macList+i)->bytes[5]);
}
@@ -1212,7 +1212,7 @@
*/
if (eSAP_SUPPORT_ACCEPT_AND_DENY == sapContext->eSapMacAddrAclMode)
{
- sapSignalHDDevent(sapContext, NULL, eSAP_UNKNOWN_STA_JOIN, (v_PVOID_t)peerMac);
+ sapSignalHDDevent(sapContext, NULL, eSAP_UNKNOWN_STA_JOIN, (v_PVOID_t)peerMac);
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Peer %02x:%02x:%02x:%02x:%02x:%02x denied, Mac filter mode is eSAP_SUPPORT_ACCEPT_AND_DENY",
__FUNCTION__, *peerMac, *(peerMac + 1), *(peerMac + 2), *(peerMac + 3), *(peerMac + 4), *(peerMac + 5));
return VOS_STATUS_E_FAILURE;
@@ -1243,42 +1243,38 @@
*channelList = NULL;
return VOS_STATUS_E_FAULT;
}
-
+
ccmCfgGetInt(hHal, WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL, &startChannelNum);
ccmCfgGetInt(hHal, WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL, &endChannelNum);
ccmCfgGetInt(hHal, WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND, &operatingBand);
ccmCfgGetInt(hHal, WNI_CFG_ENABLE_LTE_COEX, &enableLTECoex);
-
+
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO,
"%s:sapGetChannelList: startChannel %d,EndChannel %d,Operatingband:%d",
__FUNCTION__,startChannelNum,endChannelNum,operatingBand);
-
+
switch(operatingBand)
{
case RF_SUBBAND_2_4_GHZ:
bandStartChannel = RF_CHAN_1;
bandEndChannel = RF_CHAN_14;
break;
-
+
case RF_SUBBAND_5_LOW_GHZ:
bandStartChannel = RF_CHAN_36;
bandEndChannel = RF_CHAN_64;
break;
-
+
case RF_SUBBAND_5_MID_GHZ:
bandStartChannel = RF_CHAN_100;
bandEndChannel = RF_CHAN_140;
break;
-
+
case RF_SUBBAND_5_HIGH_GHZ:
bandStartChannel = RF_CHAN_149;
bandEndChannel = RF_CHAN_165;
break;
-
- case RF_SUBBAND_4_9_GHZ:
- bandStartChannel = RF_CHAN_240;
- bandEndChannel = RF_CHAN_216;
- break;
+
default:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"sapGetChannelList:OperatingBand not valid ");
@@ -1288,12 +1284,12 @@
break;
}
/*Check if LTE coex is enabled and 2.4GHz is selected*/
- if (enableLTECoex && (bandStartChannel == RF_CHAN_1)
+ if (enableLTECoex && (bandStartChannel == RF_CHAN_1)
&& (bandEndChannel == RF_CHAN_14))
{
/*Set 2.4GHz upper limit to channel 9 for LTE COEX*/
bandEndChannel = RF_CHAN_9;
- }
+ }
/* Allocate the max number of channel supported */
list = (v_U8_t *)vos_mem_malloc(NUM_5GHZ_CHANNELS);
if (NULL == list)
@@ -1314,13 +1310,13 @@
{
if( regChannels[loopCount].enabled )
{
- list[channelCount] = rfChannels[loopCount].channelNum;
+ list[channelCount] = rfChannels[loopCount].channelNum;
channelCount++;
}
}
}
if (0 == channelCount)
- {
+ {
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"sapGetChannelList:No active channels present in the given range for the current region");
/*LTE COEX: channel range outside the restricted 2.4GHz band limits*/
@@ -1330,11 +1326,11 @@
"sapGetChannelList:SAP cannot be started as LTE COEX restricted 2.4GHz limits");
}
}
-
+
/* return the channel list and number of channels to scan*/
*numberOfChannels = channelCount;
if(channelCount != 0)
- {
+ {
*channelList = list;
}
else
diff --git a/CORE/SAP/src/sapModule.c b/CORE/SAP/src/sapModule.c
index 686722a..2a2ccbc 100644
--- a/CORE/SAP/src/sapModule.c
+++ b/CORE/SAP/src/sapModule.c
@@ -22,17 +22,17 @@
/*===========================================================================
s a p M o d u l e . C
-
+
OVERVIEW:
-
+
This software unit holds the implementation of the WLAN SAP modules
functions providing EXTERNAL APIs. It is also where the global SAP module
context gets initialised
-
- DEPENDENCIES:
+
+ DEPENDENCIES:
Are listed for each API below.
-
+
Copyright (c) 2010 QUALCOMM Incorporated.
All Rights Reserved.
Qualcomm Confidential and Proprietary
@@ -51,7 +51,7 @@
when who what, where, why
---------- --- --------------------------------------------------------
03/15/10 SOFTAP team Created module
-06/03/10 js Added support to hostapd driven
+06/03/10 js Added support to hostapd driven
* deauth/disassoc/mic failure
===========================================================================*/
@@ -90,7 +90,7 @@
* -------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------
- * External declarations for global context
+ * External declarations for global context
* -------------------------------------------------------------------------*/
// No! Get this from VOS.
// The main per-Physical Link (per WLAN association) context.
@@ -115,29 +115,29 @@
/*==========================================================================
FUNCTION WLANSAP_Open
- DESCRIPTION
- Called at driver initialization (vos_open). SAP will initialize
- all its internal resources and will wait for the call to start to
- register with the other modules.
-
- DEPENDENCIES
-
- PARAMETERS
+ DESCRIPTION
+ Called at driver initialization (vos_open). SAP will initialize
+ all its internal resources and will wait for the call to start to
+ register with the other modules.
+
+ DEPENDENCIES
+
+ PARAMETERS
IN
- pvosGCtx : Pointer to the global vos context; a handle to SAP's
- control block can be extracted from its context
-
- RETURN VALUE
- The result code associated with performing the operation
+ pvosGCtx : Pointer to the global vos context; a handle to SAP's
+ control block can be extracted from its context
- VOS_STATUS_E_FAULT: Pointer to SAP cb is NULL ; access would cause a page
- fault
+ RETURN VALUE
+ The result code associated with performing the operation
+
+ VOS_STATUS_E_FAULT: Pointer to SAP cb is NULL ; access would cause a page
+ fault
VOS_STATUS_SUCCESS: Success
- SIDE EFFECTS
+ SIDE EFFECTS
============================================================================*/
-VOS_STATUS
+VOS_STATUS
WLANSAP_Open
(
v_PVOID_t pvosGCtx
@@ -148,7 +148,7 @@
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
VOS_ASSERT(pvosGCtx);
/*------------------------------------------------------------------------
- Allocate (and sanity check?!) SAP control block
+ Allocate (and sanity check?!) SAP control block
------------------------------------------------------------------------*/
vos_alloc_context(pvosGCtx, VOS_MODULE_ID_SAP, (v_VOID_t **)&pSapCtx, sizeof(tSapContext));
@@ -173,7 +173,7 @@
// Store a pointer to the SAP context provided by VOSS
gpSapCtx = pSapCtx;
-
+
/*------------------------------------------------------------------------
Allocate internal resources
------------------------------------------------------------------------*/
@@ -184,33 +184,33 @@
/*==========================================================================
FUNCTION WLANSAP_Start
- DESCRIPTION
- Called as part of the overall start procedure (vos_start). SAP will
- use this call to register with TL as the SAP entity for
- SAP RSN frames.
+ DESCRIPTION
+ Called as part of the overall start procedure (vos_start). SAP will
+ use this call to register with TL as the SAP entity for
+ SAP RSN frames.
- DEPENDENCIES
-
- PARAMETERS
+ DEPENDENCIES
+
+ PARAMETERS
IN
- pvosGCtx : Pointer to the global vos context; a handle to SAP's
- control block can be extracted from its context
+ pvosGCtx : Pointer to the global vos context; a handle to SAP's
+ control block can be extracted from its context
RETURN VALUE
- The result code associated with performing the operation
+ The result code associated with performing the operation
- VOS_STATUS_E_FAULT: Pointer to SAP cb is NULL ; access would cause a page
- fault
+ VOS_STATUS_E_FAULT: Pointer to SAP cb is NULL ; access would cause a page
+ fault
VOS_STATUS_SUCCESS: Success
SIDE EFFECTS
============================================================================*/
-VOS_STATUS
+VOS_STATUS
WLANSAP_Start
-(
- v_PVOID_t pvosGCtx
+(
+ v_PVOID_t pvosGCtx
)
{
#ifdef WLAN_SOFTAP_FEATURE
@@ -222,10 +222,10 @@
"WLANSAP_Start invoked successfully\n");
/*------------------------------------------------------------------------
Sanity check
- Extract SAP control block
+ Extract SAP control block
------------------------------------------------------------------------*/
pSapCtx = VOS_GET_SAP_CB(pvosGCtx);
- if ( NULL == pSapCtx )
+ if ( NULL == pSapCtx )
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
@@ -241,28 +241,28 @@
/*------------------------------------------------------------------------
Now configure the roaming profile links. To SSID and bssid.
------------------------------------------------------------------------*/
- // We have room for two SSIDs.
- pSapCtx->csrRoamProfile.SSIDs.numOfSSIDs = 1; // This is true for now.
- pSapCtx->csrRoamProfile.SSIDs.SSIDList = pSapCtx->SSIDList; //Array of two
+ // We have room for two SSIDs.
+ pSapCtx->csrRoamProfile.SSIDs.numOfSSIDs = 1; // This is true for now.
+ pSapCtx->csrRoamProfile.SSIDs.SSIDList = pSapCtx->SSIDList; //Array of two
pSapCtx->csrRoamProfile.SSIDs.SSIDList[0].SSID.length = 0;
pSapCtx->csrRoamProfile.SSIDs.SSIDList[0].handoffPermitted = VOS_FALSE;
pSapCtx->csrRoamProfile.SSIDs.SSIDList[0].ssidHidden = pSapCtx->SSIDList[0].ssidHidden;
- pSapCtx->csrRoamProfile.BSSIDs.numOfBSSIDs = 1; // This is true for now.
- pSapCtx->csrRoamProfile.BSSIDs.bssid = &pSapCtx->bssid;
+ pSapCtx->csrRoamProfile.BSSIDs.numOfBSSIDs = 1; // This is true for now.
+ pSapCtx->csrRoamProfile.BSSIDs.bssid = &pSapCtx->bssid;
// Now configure the auth type in the roaming profile. To open.
pSapCtx->csrRoamProfile.negotiatedAuthType = eCSR_AUTH_TYPE_OPEN_SYSTEM; // open is the default
-
+
if( !VOS_IS_STATUS_SUCCESS( vos_lock_init( &pSapCtx->SapGlobalLock)))
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "WLANSAP_Start failed init lock\n");
+ "WLANSAP_Start failed init lock\n");
return VOS_STATUS_E_FAULT;
}
-#endif
+#endif
return VOS_STATUS_SUCCESS;
}/* WLANSAP_Start */
@@ -271,32 +271,32 @@
FUNCTION WLANSAP_Stop
- DESCRIPTION
- Called by vos_stop to stop operation in SAP, before close. SAP will suspend all
- BT-AMP Protocol Adaption Layer operation and will wait for the close
- request to clean up its resources.
+ DESCRIPTION
+ Called by vos_stop to stop operation in SAP, before close. SAP will suspend all
+ BT-AMP Protocol Adaption Layer operation and will wait for the close
+ request to clean up its resources.
- DEPENDENCIES
-
- PARAMETERS
+ DEPENDENCIES
+
+ PARAMETERS
IN
- pvosGCtx : Pointer to the global vos context; a handle to SAP's
- control block can be extracted from its context
+ pvosGCtx : Pointer to the global vos context; a handle to SAP's
+ control block can be extracted from its context
RETURN VALUE
- The result code associated with performing the operation
+ The result code associated with performing the operation
- VOS_STATUS_E_FAULT: Pointer to SAP cb is NULL ; access would cause a page
- fault
+ VOS_STATUS_E_FAULT: Pointer to SAP cb is NULL ; access would cause a page
+ fault
VOS_STATUS_SUCCESS: Success
SIDE EFFECTS
============================================================================*/
-VOS_STATUS
+VOS_STATUS
WLANSAP_Stop
-(
- v_PVOID_t pvosGCtx
+(
+ v_PVOID_t pvosGCtx
)
{
@@ -305,7 +305,7 @@
/*------------------------------------------------------------------------
Sanity check
- Extract SAP control block
+ Extract SAP control block
------------------------------------------------------------------------*/
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
"WLANSAP_Stop invoked successfully ");
@@ -319,15 +319,15 @@
}
sapFreeRoamProfile(&pSapCtx->csrRoamProfile);
-
+
if( !VOS_IS_STATUS_SUCCESS( vos_lock_destroy( &pSapCtx->SapGlobalLock ) ) )
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "WLANSAP_Stop failed destroy lock\n");
+ "WLANSAP_Stop failed destroy lock\n");
return VOS_STATUS_E_FAULT;
}
/*------------------------------------------------------------------------
- Stop SAP (de-register RSN handler!?)
+ Stop SAP (de-register RSN handler!?)
------------------------------------------------------------------------*/
#endif
@@ -337,31 +337,31 @@
/*==========================================================================
FUNCTION WLANSAP_Close
- DESCRIPTION
- Called by vos_close during general driver close procedure. SAP will clean up
- all the internal resources.
+ DESCRIPTION
+ Called by vos_close during general driver close procedure. SAP will clean up
+ all the internal resources.
- DEPENDENCIES
+ DEPENDENCIES
- PARAMETERS
+ PARAMETERS
IN
- pvosGCtx : Pointer to the global vos context; a handle to SAP's
- control block can be extracted from its context
+ pvosGCtx : Pointer to the global vos context; a handle to SAP's
+ control block can be extracted from its context
RETURN VALUE
- The result code associated with performing the operation
+ The result code associated with performing the operation
- VOS_STATUS_E_FAULT: Pointer to SAP cb is NULL ; access would cause a page
- fault
+ VOS_STATUS_E_FAULT: Pointer to SAP cb is NULL ; access would cause a page
+ fault
VOS_STATUS_SUCCESS: Success
SIDE EFFECTS
============================================================================*/
-VOS_STATUS
+VOS_STATUS
WLANSAP_Close
-(
- v_PVOID_t pvosGCtx
+(
+ v_PVOID_t pvosGCtx
)
{
#ifdef WLAN_SOFTAP_FEATURE
@@ -370,7 +370,7 @@
/*------------------------------------------------------------------------
Sanity check
- Extract SAP control block
+ Extract SAP control block
------------------------------------------------------------------------*/
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
"WLANSAP_Close invoked");
@@ -384,13 +384,13 @@
}
/*------------------------------------------------------------------------
- Cleanup SAP control block.
+ Cleanup SAP control block.
------------------------------------------------------------------------*/
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "WLANSAP_Close");
WLANSAP_CleanCB(pSapCtx, VOS_TRUE /* empty queues/lists/pkts if any*/);
/*------------------------------------------------------------------------
- Free SAP context from VOSS global
+ Free SAP context from VOSS global
------------------------------------------------------------------------*/
vos_free_context(pvosGCtx, VOS_MODULE_ID_SAP, pSapCtx);
@@ -399,43 +399,43 @@
}/* WLANSAP_Close */
/*----------------------------------------------------------------------------
- * Utility Function implementations
+ * Utility Function implementations
* -------------------------------------------------------------------------*/
/*==========================================================================
FUNCTION WLANSAP_CleanCB
- DESCRIPTION
+ DESCRIPTION
Clear out all fields in the SAP context.
- DEPENDENCIES
+ DEPENDENCIES
- PARAMETERS
+ PARAMETERS
IN
- pvosGCtx : Pointer to the global vos context; a handle to SAP's
- control block can be extracted from its context
+ pvosGCtx : Pointer to the global vos context; a handle to SAP's
+ control block can be extracted from its context
RETURN VALUE
- The result code associated with performing the operation
+ The result code associated with performing the operation
- VOS_STATUS_E_FAULT: Pointer to SAP cb is NULL ; access would cause a page
- fault
+ VOS_STATUS_E_FAULT: Pointer to SAP cb is NULL ; access would cause a page
+ fault
VOS_STATUS_SUCCESS: Success
SIDE EFFECTS
============================================================================*/
-VOS_STATUS
+VOS_STATUS
WLANSAP_CleanCB
-(
+(
ptSapContext pSapCtx,
v_U32_t freeFlag // 0 /*do not empty*/);
)
{
#ifdef WLAN_SOFTAP_FEATURE
/*------------------------------------------------------------------------
- Sanity check SAP control block
+ Sanity check SAP control block
------------------------------------------------------------------------*/
if (NULL == pSapCtx)
@@ -457,9 +457,9 @@
pSapCtx->sapsMachine= eSAP_DISCONNECTED;
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: Initializing State: %d, sapContext value = %x",
- __FUNCTION__, pSapCtx->sapsMachine, pSapCtx);
+ __FUNCTION__, pSapCtx->sapsMachine, pSapCtx);
pSapCtx->sessionId = 0;
- pSapCtx->channel = 0;
+ pSapCtx->channel = 0;
#endif
return VOS_STATUS_SUCCESS;
@@ -468,16 +468,16 @@
/*==========================================================================
FUNCTION WLANSAP_pmcFullPwrReqCB
- DESCRIPTION
- Callback provide to PMC in the pmcRequestFullPower API.
+ DESCRIPTION
+ Callback provide to PMC in the pmcRequestFullPower API.
- DEPENDENCIES
+ DEPENDENCIES
- PARAMETERS
+ PARAMETERS
IN
- callbackContext: The user passed in a context to identify
- status: The halStatus
+ callbackContext: The user passed in a context to identify
+ status: The halStatus
RETURN VALUE
None
@@ -497,7 +497,7 @@
}
else
{
- VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_FATAL,
+ VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_FATAL,
"WLANSAP_pmcFullPwrReqCB: PMC failed to put the chip in Full power\n");
}
@@ -506,21 +506,21 @@
/*==========================================================================
FUNCTION WLANSAP_getState
- DESCRIPTION
+ DESCRIPTION
This api returns the current SAP state to the caller.
- DEPENDENCIES
+ DEPENDENCIES
- PARAMETERS
+ PARAMETERS
IN
pContext : Pointer to Sap Context structure
RETURN VALUE
- Returns the SAP FSM state.
+ Returns the SAP FSM state.
============================================================================*/
-v_U8_t WLANSAP_getState
+v_U8_t WLANSAP_getState
(
v_PVOID_t pvosGCtx
)
@@ -541,13 +541,13 @@
/*==========================================================================
FUNCTION WLANSAP_StartBss
- DESCRIPTION
+ DESCRIPTION
This api function provides SAP FSM event eWLAN_SAP_PHYSICAL_LINK_CREATE for
starting AP BSS
- DEPENDENCIES
+ DEPENDENCIES
- PARAMETERS
+ PARAMETERS
IN
pContext : Pointer to Sap Context structure
@@ -556,15 +556,15 @@
pUsrContext : Parameter that will be passed back in all the SAP callback events.
RETURN VALUE
- The result code associated with performing the operation
+ The result code associated with performing the operation
- VOS_STATUS_E_FAULT: Pointer to SAP cb is NULL ; access would cause a page
- fault
+ VOS_STATUS_E_FAULT: Pointer to SAP cb is NULL ; access would cause a page
+ fault
VOS_STATUS_SUCCESS: Success
SIDE EFFECTS
============================================================================*/
-VOS_STATUS
+VOS_STATUS
WLANSAP_StartBss
(
v_PVOID_t pvosGCtx,//pwextCtx
@@ -577,13 +577,13 @@
VOS_STATUS vosStatus = VOS_STATUS_SUCCESS;
ptSapContext pSapCtx = NULL;
tANI_BOOLEAN restartNeeded;
- tHalHandle hHal;
-
+ tHalHandle hHal;
+
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
/*------------------------------------------------------------------------
Sanity check
- Extract SAP control block
+ Extract SAP control block
------------------------------------------------------------------------*/
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
"WLANSAP_StartBss");
@@ -605,19 +605,19 @@
//Set the BSSID to your "self MAC Addr" read the mac address from Configuation ITEM received from HDD
pSapCtx->csrRoamProfile.BSSIDs.numOfBSSIDs = 1;
- vos_mem_copy(pSapCtx->csrRoamProfile.BSSIDs.bssid,
+ vos_mem_copy(pSapCtx->csrRoamProfile.BSSIDs.bssid,
pSapCtx->self_mac_addr,
- sizeof( tCsrBssid ) );
+ sizeof( tCsrBssid ) );
//Save a copy to SAP context
- vos_mem_copy(pSapCtx->csrRoamProfile.BSSIDs.bssid,
+ vos_mem_copy(pSapCtx->csrRoamProfile.BSSIDs.bssid,
pConfig->self_macaddr.bytes, sizeof(v_MACADDR_t));
vos_mem_copy(pSapCtx->self_mac_addr,
pConfig->self_macaddr.bytes, sizeof(v_MACADDR_t));
//copy the configuration items to csrProfile
sapconvertToCsrProfile( pConfig, eCSR_BSS_TYPE_INFRA_AP, &pSapCtx->csrRoamProfile);
- hHal = (tHalHandle)VOS_GET_HAL_CB(pvosGCtx);
+ hHal = (tHalHandle)VOS_GET_HAL_CB(pvosGCtx);
if (NULL == hHal)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
@@ -668,28 +668,28 @@
/*==========================================================================
FUNCTION WLANSAP_StopBss
- DESCRIPTION
+ DESCRIPTION
This api function provides SAP FSM event eSAP_HDD_STOP_INFRA_BSS for
stopping AP BSS
- DEPENDENCIES
+ DEPENDENCIES
- PARAMETERS
+ PARAMETERS
IN
- pvosGCtx : Pointer to the global vos context; a handle to SAP's
+ pvosGCtx : Pointer to the global vos context; a handle to SAP's
control block can be extracted from its contexe
RETURN VALUE
- The result code associated with performing the operation
+ The result code associated with performing the operation
- VOS_STATUS_E_FAULT: Pointer to VOSS GC is NULL ; access would cause a page
- fault
+ VOS_STATUS_E_FAULT: Pointer to VOSS GC is NULL ; access would cause a page
+ fault
VOS_STATUS_SUCCESS: Success
SIDE EFFECTS
============================================================================*/
-VOS_STATUS
+VOS_STATUS
WLANSAP_StopBss
(
v_PVOID_t pvosGCtx
@@ -702,12 +702,12 @@
/*------------------------------------------------------------------------
Sanity check
- Extract SAP control block
+ Extract SAP control block
------------------------------------------------------------------------*/
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
"WLANSAP_StopBss");
- if ( NULL == pvosGCtx )
+ if ( NULL == pvosGCtx )
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"%s: Invalid Global VOSS handle", __FUNCTION__);
@@ -736,11 +736,11 @@
/*==========================================================================
FUNCTION WLANSAP_GetAssocStations
- DESCRIPTION
+ DESCRIPTION
This api function is used to probe the list of associated stations from various modules of CORE stack
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
PARAMETERS
@@ -772,7 +772,7 @@
/*------------------------------------------------------------------------
Sanity check
- Extract SAP control block
+ Extract SAP control block
------------------------------------------------------------------------*/
if (NULL == pSapCtx)
{
@@ -794,25 +794,25 @@
/*==========================================================================
FUNCTION WLANSAP_RemoveWpsSessionOverlap
- DESCRIPTION
+ DESCRIPTION
This api function provides for Ap App/HDD to remove an entry from session session overlap info.
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
PARAMETERS
IN
pvosGCtx: Pointer to vos global context structure
pRemoveMac: pointer to v_MACADDR_t for session MAC address
-
+
RETURN VALUE
- The VOS_STATUS code associated with performing the operation
+ The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
VOS_STATUS_E_FAULT: Session is not dectected. The parameter is function not valid.
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
VOS_STATUS
WLANSAP_RemoveWpsSessionOverlap
@@ -826,7 +826,7 @@
/*------------------------------------------------------------------------
Sanity check
- Extract SAP control block
+ Extract SAP control block
------------------------------------------------------------------------*/
if (NULL == pSapCtx)
{
@@ -846,37 +846,37 @@
/*==========================================================================
FUNCTION WLANSAP_getWpsSessionOverlap
- DESCRIPTION
+ DESCRIPTION
This api function provides for Ap App/HDD to get WPS session overlap info.
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
PARAMETERS
IN
pvosGCtx: Pointer to vos global context structure
-
+
RETURN VALUE
- The VOS_STATUS code associated with performing the operation
+ The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
VOS_STATUS
WLANSAP_getWpsSessionOverlap
(
- v_PVOID_t pvosGCtx
+ v_PVOID_t pvosGCtx
)
{
- v_MACADDR_t pRemoveMac = VOS_MAC_ADDR_ZERO_INITIALIZER;
+ v_MACADDR_t pRemoveMac = VOS_MAC_ADDR_ZERO_INITIALIZER;
ptSapContext pSapCtx = VOS_GET_SAP_CB(pvosGCtx);
/*------------------------------------------------------------------------
Sanity check
- Extract SAP control block
+ Extract SAP control block
------------------------------------------------------------------------*/
if (NULL == pSapCtx)
{
@@ -884,7 +884,7 @@
"%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
return VOS_STATUS_E_FAULT;
}
-
+
sme_RoamGetWpsSessionOverlap( VOS_GET_HAL_CB(pSapCtx->pvosGCtx), pSapCtx->sessionId,
pSapCtx->pUsrContext,
(v_PVOID_t *)pSapCtx->pfnSapEventCallback,
@@ -913,7 +913,7 @@
/* This routine will clear all the entries in accept list as well as deny list */
-VOS_STATUS
+VOS_STATUS
WLANSAP_ClearACL( v_PVOID_t pvosGCtx)
{
ptSapContext pSapCtx = VOS_GET_SAP_CB(pvosGCtx);
@@ -924,7 +924,7 @@
return VOS_STATUS_E_RESOURCES;
}
- if (pSapCtx->denyMacList != NULL)
+ if (pSapCtx->denyMacList != NULL)
{
for (i = 0; i < (pSapCtx->nDenyMac-1); i++)
{
@@ -935,7 +935,7 @@
sapPrintACL(pSapCtx->denyMacList, pSapCtx->nDenyMac);
pSapCtx->nDenyMac = 0;
- if (pSapCtx->acceptMacList!=NULL)
+ if (pSapCtx->acceptMacList!=NULL)
{
for (i = 0; i < (pSapCtx->nAcceptMac-1); i++)
{
@@ -945,11 +945,11 @@
}
sapPrintACL(pSapCtx->acceptMacList, pSapCtx->nAcceptMac);
pSapCtx->nAcceptMac = 0;
-
+
return VOS_STATUS_SUCCESS;
}
-VOS_STATUS
+VOS_STATUS
WLANSAP_ModifyACL
(
v_PVOID_t pvosGCtx,
@@ -957,7 +957,7 @@
eSapACLType listType,
eSapACLCmdType cmd
)
-{
+{
eSapBool staInWhiteList=eSAP_FALSE, staInBlackList=eSAP_FALSE;
v_U8_t staWLIndex, staBLIndex;
ptSapContext pSapCtx = VOS_GET_SAP_CB(pvosGCtx);
@@ -987,7 +987,7 @@
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"Peer mac %02x:%02x:%02x:%02x:%02x:%02x found in white and black lists."
- "Initial lists passed incorrect. Cannot execute this command.",
+ "Initial lists passed incorrect. Cannot execute this command.",
pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2], pPeerStaMac[3],
pPeerStaMac[4], pPeerStaMac[5]);
return VOS_STATUS_E_FAILURE;
@@ -996,7 +996,7 @@
switch(listType)
{
- case eSAP_WHITE_LIST:
+ case eSAP_WHITE_LIST:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_LOW, "cmd %d", cmd);
if (cmd == ADD_STA_TO_ACL)
{
@@ -1005,7 +1005,7 @@
if (pSapCtx->nAcceptMac == MAX_MAC_ADDRESS_ACCEPTED)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "White list is already maxed out. Cannot accept %02x:%02x:%02x:%02x:%02x:%02x",
+ "White list is already maxed out. Cannot accept %02x:%02x:%02x:%02x:%02x:%02x",
pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2], pPeerStaMac[3],
pPeerStaMac[4], pPeerStaMac[5]);
return VOS_STATUS_E_FAILURE;
@@ -1017,28 +1017,28 @@
"MAC address already present in white list %02x:%02x:%02x:%02x:%02x:%02x",
pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2], pPeerStaMac[3],
pPeerStaMac[4], pPeerStaMac[5]);
- } else
+ } else
{
if (staInBlackList)
{
//remove it from black list before adding to the white list
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_WARN,
"STA present in black list so first remove from it");
- sapRemoveMacFromACL(pSapCtx->denyMacList, &pSapCtx->nDenyMac, staBLIndex);
+ sapRemoveMacFromACL(pSapCtx->denyMacList, &pSapCtx->nDenyMac, staBLIndex);
}
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO,
- "... Now add to the white list");
+ "... Now add to the white list");
sapAddMacToACL(pSapCtx->acceptMacList, &pSapCtx->nAcceptMac, pPeerStaMac);
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_LOW, "size of accept and deny lists %d %d",
pSapCtx->nAcceptMac, pSapCtx->nDenyMac);
- }
+ }
}
else if (cmd == DELETE_STA_FROM_ACL)
{
if (staInWhiteList)
{
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO, "Delete from white list");
- sapRemoveMacFromACL(pSapCtx->acceptMacList, &pSapCtx->nAcceptMac, staWLIndex);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO, "Delete from white list");
+ sapRemoveMacFromACL(pSapCtx->acceptMacList, &pSapCtx->nAcceptMac, staWLIndex);
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_LOW, "size of accept and deny lists %d %d",
pSapCtx->nAcceptMac, pSapCtx->nDenyMac);
}
@@ -1053,12 +1053,12 @@
}
else
{
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "Invalid cmd type passed");
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "Invalid cmd type passed");
return VOS_STATUS_E_FAILURE;
}
break;
- case eSAP_BLACK_LIST:
+ case eSAP_BLACK_LIST:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_LOW,
"cmd %d", cmd);
if (cmd == ADD_STA_TO_ACL)
@@ -1080,28 +1080,28 @@
"MAC address already present in black list %02x:%02x:%02x:%02x:%02x:%02x",
pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2], pPeerStaMac[3],
pPeerStaMac[4], pPeerStaMac[5]);
- } else
+ } else
{
if (staInWhiteList)
{
//remove it from white list before adding to the white list
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_WARN,
"Present in white list so first remove from it");
- sapRemoveMacFromACL(pSapCtx->acceptMacList, &pSapCtx->nAcceptMac, staWLIndex);
+ sapRemoveMacFromACL(pSapCtx->acceptMacList, &pSapCtx->nAcceptMac, staWLIndex);
}
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO,
- "... Now add to black list");
+ "... Now add to black list");
sapAddMacToACL(pSapCtx->denyMacList, &pSapCtx->nDenyMac, pPeerStaMac);
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_LOW,"size of accept and deny lists %d %d",
pSapCtx->nAcceptMac, pSapCtx->nDenyMac);
- }
+ }
}
else if (cmd == DELETE_STA_FROM_ACL)
{
if (staInBlackList)
{
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO, "Delete from black list");
- sapRemoveMacFromACL(pSapCtx->denyMacList, &pSapCtx->nDenyMac, staBLIndex);
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO, "Delete from black list");
+ sapRemoveMacFromACL(pSapCtx->denyMacList, &pSapCtx->nDenyMac, staBLIndex);
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_LOW,"no accept and deny mac %d %d",
pSapCtx->nAcceptMac, pSapCtx->nDenyMac);
}
@@ -1116,7 +1116,7 @@
}
else
{
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "Invalid cmd type passed");
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "Invalid cmd type passed");
return VOS_STATUS_E_FAILURE;
}
break;
@@ -1139,26 +1139,26 @@
/*==========================================================================
FUNCTION WLANSAP_DisassocSta
- DESCRIPTION
+ DESCRIPTION
This api function provides for Ap App/HDD initiated disassociation of station
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
PARAMETERS
IN
pvosGCtx : Pointer to vos global context structure
pPeerStaMac : Mac address of the station to disassociate
-
+
RETURN VALUE
- The VOS_STATUS code associated with performing the operation
+ The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
-VOS_STATUS
+VOS_STATUS
WLANSAP_DisassocSta
(
v_PVOID_t pvosGCtx,
@@ -1169,8 +1169,8 @@
/*------------------------------------------------------------------------
Sanity check
- Extract SAP control block
- ------------------------------------------------------------------------*/
+ Extract SAP control block
+ ------------------------------------------------------------------------*/
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
@@ -1188,26 +1188,26 @@
/*==========================================================================
FUNCTION WLANSAP_DeauthSta
- DESCRIPTION
+ DESCRIPTION
This api function provides for Ap App/HDD initiated deauthentication of station
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
PARAMETERS
IN
pvosGCtx : Pointer to vos global context structure
pPeerStaMac : Mac address of the station to deauthenticate
-
+
RETURN VALUE
- The VOS_STATUS code associated with performing the operation
+ The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
-VOS_STATUS
+VOS_STATUS
WLANSAP_DeauthSta
(
v_PVOID_t pvosGCtx,
@@ -1218,8 +1218,8 @@
/*------------------------------------------------------------------------
Sanity check
- Extract SAP control block
- ------------------------------------------------------------------------*/
+ Extract SAP control block
+ ------------------------------------------------------------------------*/
if (NULL == pSapCtx)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
@@ -1235,11 +1235,11 @@
/*==========================================================================
FUNCTION WLANSAP_SetChannelRange
- DESCRIPTION
+ DESCRIPTION
This api function sets the range of channels for AP.
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
PARAMETERS
@@ -1247,16 +1247,16 @@
startChannel : start channel
endChannel : End channel
operatingBand : Operating band (2.4GHz/5GHz)
-
+
RETURN VALUE
- The VOS_STATUS code associated with performing the operation
+ The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
VOS_STATUS
-WLANSAP_SetChannelRange(tHalHandle hHal,v_U8_t startChannel, v_U8_t endChannel,
+WLANSAP_SetChannelRange(tHalHandle hHal,v_U8_t startChannel, v_U8_t endChannel,
v_U8_t operatingBand)
{
@@ -1264,7 +1264,7 @@
v_U8_t loopStartCount =0;
v_U8_t loopEndCount =0;
v_U8_t bandStartChannel =0;
- v_U8_t bandEndChannel =0;
+ v_U8_t bandEndChannel =0;
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO,
"WLANSAP_SetChannelRange:startChannel %d,EndChannel %d,Operatingband:%d",
@@ -1272,7 +1272,7 @@
/*------------------------------------------------------------------------
Sanity check
- ------------------------------------------------------------------------*/
+ ------------------------------------------------------------------------*/
if (( WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND_APMIN > operatingBand)||
(WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND_APMAX < operatingBand))
{
@@ -1300,36 +1300,32 @@
bandStartChannel = RF_CHAN_1;
bandEndChannel = RF_CHAN_14;
break;
-
+
case RF_SUBBAND_5_LOW_GHZ:
bandStartChannel = RF_CHAN_36;
bandEndChannel = RF_CHAN_64;
break;
-
+
case RF_SUBBAND_5_MID_GHZ:
bandStartChannel = RF_CHAN_100;
bandEndChannel = RF_CHAN_140;
break;
-
+
case RF_SUBBAND_5_HIGH_GHZ:
bandStartChannel = RF_CHAN_149;
bandEndChannel = RF_CHAN_165;
break;
-
- case RF_SUBBAND_4_9_GHZ:
- bandStartChannel = RF_CHAN_240;
- bandEndChannel = RF_CHAN_216;
- break;
+
default:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"Invalid operatingBand value on WLANSAP_SetChannelRange");
break;
- }
-
+ }
+
/* Validating the start channel is in range or not*/
- for(loopStartCount = bandStartChannel ; loopStartCount <= bandEndChannel ;
+ for(loopStartCount = bandStartChannel ; loopStartCount <= bandEndChannel ;
loopStartCount++)
- {
+ {
if(rfChannels[loopStartCount].channelNum == startChannel )
{
/* start channel is in the range */
@@ -1337,9 +1333,9 @@
}
}
/* Validating the End channel is in range or not*/
- for(loopEndCount = bandStartChannel ; loopEndCount <= bandEndChannel ;
+ for(loopEndCount = bandStartChannel ; loopEndCount <= bandEndChannel ;
loopEndCount++)
- {
+ {
if(rfChannels[loopEndCount].channelNum == endChannel )
{
/* End channel is in the range */
@@ -1351,12 +1347,12 @@
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"%s: Invalid startChannel-%d or EndChannel-%d for band -%d",
__FUNCTION__,startChannel,endChannel,operatingBand);
- /* Supplied channels are nt in the operating band so set the default
+ /* Supplied channels are nt in the operating band so set the default
channels for the given operating band */
startChannel = rfChannels[bandStartChannel].channelNum;
endChannel = rfChannels[bandEndChannel].channelNum;;
}
-
+
/*Search for the Active channels in the given range */
for( loopStartCount = bandStartChannel; loopStartCount <= bandEndChannel; loopStartCount++ )
{
@@ -1371,36 +1367,36 @@
}
}
if(0 == validChannelFlag)
- {
+ {
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"%s-No active channels present in the given range for the current region",
__FUNCTION__);
- /* There is no active channel in the supplied range.Updating the config
+ /* There is no active channel in the supplied range.Updating the config
with the default channels in the given band so that we can select the best channel in the sub-band*/
startChannel = rfChannels[bandStartChannel].channelNum;
endChannel = rfChannels[bandEndChannel].channelNum;;
}
-
- if (ccmCfgSetInt(hHal, WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND,
+
+ if (ccmCfgSetInt(hHal, WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND,
operatingBand, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"Could not pass on WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND to CCn");
return VOS_STATUS_E_FAULT;
}
- if (ccmCfgSetInt(hHal, WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL,
+ if (ccmCfgSetInt(hHal, WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL,
startChannel, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
{
-
+
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"Could not pass on WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL to CCM");
return VOS_STATUS_E_FAULT;
-
- }
- if (ccmCfgSetInt(hHal, WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL,
+
+ }
+ if (ccmCfgSetInt(hHal, WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL,
endChannel, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
{
-
+
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"Could not pass on WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL to CCM");
return VOS_STATUS_E_FAULT;
@@ -1412,18 +1408,18 @@
/*==========================================================================
FUNCTION WLANSAP_SetCounterMeasure
- DESCRIPTION
- This api function is used to disassociate all the stations and prevent
- association for any other station.Whenever Authenticator receives 2 mic failures
- within 60 seconds, Authenticator will enable counter measure at SAP Layer.
- Authenticator will start the 60 seconds timer. Core stack will not allow any
- STA to associate till HDD disables counter meassure. Core stack shall kick out all the
- STA which are currently associated and DIASSOC Event will be propogated to HDD for
- each STA to clean up the HDD STA table.Once the 60 seconds timer expires, Authenticator
+ DESCRIPTION
+ This api function is used to disassociate all the stations and prevent
+ association for any other station.Whenever Authenticator receives 2 mic failures
+ within 60 seconds, Authenticator will enable counter measure at SAP Layer.
+ Authenticator will start the 60 seconds timer. Core stack will not allow any
+ STA to associate till HDD disables counter meassure. Core stack shall kick out all the
+ STA which are currently associated and DIASSOC Event will be propogated to HDD for
+ each STA to clean up the HDD STA table.Once the 60 seconds timer expires, Authenticator
will disable the counter meassure at core stack. Now core stack can allow STAs to associate.
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
PARAMETERS
@@ -1431,13 +1427,13 @@
pvosGCtx: Pointer to vos global context structure
bEnable: If TRUE than all stations will be disassociated and no more will be allowed to associate. If FALSE than CORE
will come out of this state.
-
+
RETURN VALUE
- The VOS_STATUS code associated with performing the operation
+ The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
VOS_STATUS
WLANSAP_SetCounterMeasure
@@ -1450,7 +1446,7 @@
/*------------------------------------------------------------------------
Sanity check
- Extract SAP control block
+ Extract SAP control block
------------------------------------------------------------------------*/
if (NULL == pSapCtx)
{
@@ -1468,24 +1464,24 @@
FUNCTION WLANSAP_SetKeysSta
- DESCRIPTION
+ DESCRIPTION
This api function provides for Ap App/HDD to set key for a station.
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
PARAMETERS
IN
pvosGCtx: Pointer to vos global context structure
pSetKeyInfo: tCsrRoamSetKey structure for the station
-
+
RETURN VALUE
- The VOS_STATUS code associated with performing the operation
+ The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
VOS_STATUS
WLANSAP_SetKeySta
@@ -1534,29 +1530,29 @@
/*==========================================================================
FUNCTION WLANSAP_DelKeySta
- DESCRIPTION
+ DESCRIPTION
This api function provides for Ap App/HDD to delete key for a station.
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
PARAMETERS
IN
pvosGCtx: Pointer to vos global context structure
pSetKeyInfo: tCsrRoamRemoveKey structure for the station
-
+
RETURN VALUE
- The VOS_STATUS code associated with performing the operation
+ The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
VOS_STATUS
WLANSAP_DelKeySta
(
- v_PVOID_t pvosGCtx,
+ v_PVOID_t pvosGCtx,
tCsrRoamRemoveKey *pRemoveKeyInfo
)
{
@@ -1571,7 +1567,7 @@
{
pSapCtx = VOS_GET_SAP_CB(pvosGCtx);
if (NULL == pSapCtx)
- {
+ {
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
return VOS_STATUS_E_FAULT;
@@ -1587,7 +1583,7 @@
vos_mem_zero(&RemoveKeyInfo, sizeof(RemoveKeyInfo));
RemoveKeyInfo.encType = pRemoveKeyInfo->encType;
- vos_mem_copy(RemoveKeyInfo.peerMac, pRemoveKeyInfo->peerMac, WNI_CFG_BSSID_LEN);
+ vos_mem_copy(RemoveKeyInfo.peerMac, pRemoveKeyInfo->peerMac, WNI_CFG_BSSID_LEN);
RemoveKeyInfo.keyId = pRemoveKeyInfo->keyId;
halStatus = sme_RoamRemoveKey(hHal, pSapCtx->sessionId, &RemoveKeyInfo, &roamId);
@@ -1608,7 +1604,7 @@
}
VOS_STATUS
-WLANSap_getstationIE_information(v_PVOID_t pvosGCtx,
+WLANSap_getstationIE_information(v_PVOID_t pvosGCtx,
v_U32_t *pLen,
v_U8_t *pBuf)
{
@@ -1619,7 +1615,7 @@
if (VOS_STA_SAP_MODE == vos_get_conparam ( )){
pSapCtx = VOS_GET_SAP_CB(pvosGCtx);
if (NULL == pSapCtx)
- {
+ {
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
return VOS_STATUS_E_FAULT;
@@ -1645,12 +1641,12 @@
}
}
}
-
+
if( VOS_STATUS_E_FAILURE == vosStatus)
{
VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"%s: Error unable to populate the RSNWPAIE",
- __FUNCTION__);
+ __FUNCTION__);
}
return vosStatus;
@@ -1660,24 +1656,24 @@
/*==========================================================================
FUNCTION WLANSAP_Set_WpsIe
- DESCRIPTION
+ DESCRIPTION
This api function provides for Ap App/HDD to set WPS IE.
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
PARAMETERS
IN
pvosGCtx: Pointer to vos global context structure
pWPSIE: tSap_WPSIE structure that include WPS IEs
-
+
RETURN VALUE
- The VOS_STATUS code associated with performing the operation
+ The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
VOS_STATUS
WLANSAP_Set_WpsIe
@@ -1689,31 +1685,31 @@
v_PVOID_t hHal = NULL;
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO,
- "%s, %d", __FUNCTION__, __LINE__);
-
+ "%s, %d", __FUNCTION__, __LINE__);
+
if(VOS_STA_SAP_MODE == vos_get_conparam ( )) {
pSapCtx = VOS_GET_SAP_CB(pvosGCtx);
if ( NULL == pSapCtx )
- {
+ {
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
return VOS_STATUS_E_FAULT;
}
-
+
hHal = VOS_GET_HAL_CB(pSapCtx->pvosGCtx);
if ( NULL == hHal ){
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"%s: Invalid HAL pointer from pvosGCtx", __FUNCTION__);
return VOS_STATUS_E_FAULT;
}
-
+
if ( sap_AcquireGlobalLock( pSapCtx ) == VOS_STATUS_SUCCESS )
{
if (pSap_WPSIe->sapWPSIECode == eSAP_WPS_BEACON_IE)
{
- vos_mem_copy(&pSapCtx->APWPSIEs.SirWPSBeaconIE, &pSap_WPSIe->sapwpsie.sapWPSBeaconIE, sizeof(tSap_WPSBeaconIE));
+ vos_mem_copy(&pSapCtx->APWPSIEs.SirWPSBeaconIE, &pSap_WPSIe->sapwpsie.sapWPSBeaconIE, sizeof(tSap_WPSBeaconIE));
}
- else if (pSap_WPSIe->sapWPSIECode == eSAP_WPS_PROBE_RSP_IE)
+ else if (pSap_WPSIe->sapWPSIECode == eSAP_WPS_PROBE_RSP_IE)
{
vos_mem_copy(&pSapCtx->APWPSIEs.SirWPSProbeRspIE, &pSap_WPSIe->sapwpsie.sapWPSProbeRspIE, sizeof(tSap_WPSProbeRspIE));
}
@@ -1735,23 +1731,23 @@
/*==========================================================================
FUNCTION WLANSAP_Update_WpsIe
- DESCRIPTION
+ DESCRIPTION
This api function provides for Ap App/HDD to update WPS IEs.
DEPENDENCIES
- NA.
+ NA.
PARAMETERS
IN
pvosGCtx: Pointer to vos global context structure
-
+
RETURN VALUE
- The VOS_STATUS code associated with performing the operation
+ The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
VOS_STATUS
WLANSAP_Update_WpsIe
@@ -1765,12 +1761,12 @@
v_PVOID_t hHal = NULL;
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "%s, %d", __FUNCTION__, __LINE__);
-
+ "%s, %d", __FUNCTION__, __LINE__);
+
if(VOS_STA_SAP_MODE == vos_get_conparam ( )){
pSapCtx = VOS_GET_SAP_CB(pvosGCtx);
if ( NULL == pSapCtx )
- {
+ {
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
return VOS_STATUS_E_FAULT;
@@ -1800,11 +1796,11 @@
/*==========================================================================
FUNCTION WLANSAP_Get_WPS_State
- DESCRIPTION
+ DESCRIPTION
This api function provides for Ap App/HDD to check if WPS session in process.
DEPENDENCIES
- NA.
+ NA.
PARAMETERS
@@ -1813,13 +1809,13 @@
OUT
pbWPSState: Pointer to variable to indicate if it is in WPS Registration state
-
+
RETURN VALUE
- The VOS_STATUS code associated with performing the operation
+ The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
VOS_STATUS
WLANSAP_Get_WPS_State
@@ -1831,13 +1827,13 @@
v_PVOID_t hHal = NULL;
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO,
- "%s, %d", __FUNCTION__, __LINE__);
-
+ "%s, %d", __FUNCTION__, __LINE__);
+
if(VOS_STA_SAP_MODE == vos_get_conparam ( )){
-
+
pSapCtx = VOS_GET_SAP_CB(pvosGCtx);
if ( NULL == pSapCtx )
- {
+ {
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
return VOS_STATUS_E_FAULT;
@@ -1849,19 +1845,19 @@
"%s: Invalid HAL pointer from pvosGCtx", __FUNCTION__);
return VOS_STATUS_E_FAULT;
}
-
+
if ( sap_AcquireGlobalLock(pSapCtx ) == VOS_STATUS_SUCCESS )
{
if(pSapCtx->APWPSIEs.SirWPSProbeRspIE.FieldPresent & SIR_WPS_PROBRSP_SELECTEDREGISTRA_PRESENT)
*bWPSState = eANI_BOOLEAN_TRUE;
else
*bWPSState = eANI_BOOLEAN_FALSE;
-
+
sap_ReleaseGlobalLock( pSapCtx );
-
+
return VOS_STATUS_SUCCESS;
}
- else
+ else
return VOS_STATUS_E_FAULT;
}
else
@@ -1872,7 +1868,7 @@
VOS_STATUS
sap_AcquireGlobalLock
(
- ptSapContext pSapCtx
+ ptSapContext pSapCtx
)
{
VOS_STATUS vosStatus = VOS_STATUS_E_FAULT;
@@ -1888,7 +1884,7 @@
VOS_STATUS
sap_ReleaseGlobalLock
(
- ptSapContext pSapCtx
+ ptSapContext pSapCtx
)
{
VOS_STATUS vosStatus = VOS_STATUS_E_FAULT;
@@ -1904,29 +1900,29 @@
/*==========================================================================
FUNCTION WLANSAP_Set_WPARSNIes
- DESCRIPTION
+ DESCRIPTION
This api function provides for Ap App/HDD to set AP WPA and RSN IE in its beacon and probe response.
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
PARAMETERS
IN
pvosGCtx: Pointer to vos global context structure
- pWPARSNIEs: buffer to the WPA/RSN IEs
+ pWPARSNIEs: buffer to the WPA/RSN IEs
WPARSNIEsLen: length of WPA/RSN IEs
-
+
RETURN VALUE
- The VOS_STATUS code associated with performing the operation
+ The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
VOS_STATUS WLANSAP_Set_WPARSNIes(v_PVOID_t pvosGCtx, v_U8_t *pWPARSNIEs, v_U32_t WPARSNIEsLen)
{
-
+
ptSapContext pSapCtx = NULL;
eHalStatus halStatus = eHAL_STATUS_FAILURE;
v_PVOID_t hHal = NULL;
@@ -1934,7 +1930,7 @@
if(VOS_STA_SAP_MODE == vos_get_conparam ( )){
pSapCtx = VOS_GET_SAP_CB(pvosGCtx);
if ( NULL == pSapCtx )
- {
+ {
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
"%s: Invalid SAP pointer from pvosGCtx", __FUNCTION__);
return VOS_STATUS_E_FAULT;
@@ -1946,10 +1942,10 @@
"%s: Invalid HAL pointer from pvosGCtx", __FUNCTION__);
return VOS_STATUS_E_FAULT;
}
-
+
pSapCtx->APWPARSNIEs.length = (tANI_U16)WPARSNIEsLen;
vos_mem_copy(pSapCtx->APWPARSNIEs.rsnIEdata, pWPARSNIEs, WPARSNIEsLen);
-
+
halStatus = sme_RoamUpdateAPWPARSNIEs( hHal, pSapCtx->sessionId, &pSapCtx->APWPARSNIEs);
if(halStatus == eHAL_STATUS_SUCCESS) {
@@ -1960,7 +1956,7 @@
}
}
- return VOS_STATUS_E_FAULT;
+ return VOS_STATUS_E_FAULT;
}
VOS_STATUS WLANSAP_GetStatistics(v_PVOID_t pvosGCtx, tSap_SoftapStats *statBuf, v_BOOL_t bReset)
@@ -1978,11 +1974,11 @@
FUNCTION WLANSAP_SendAction
- DESCRIPTION
+ DESCRIPTION
This api function provides to send action frame sent by upper layer.
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
PARAMETERS
@@ -1990,13 +1986,13 @@
pvosGCtx: Pointer to vos global context structure
pBuf: Pointer of the action frame to be transmitted
len: Length of the action frame
-
+
RETURN VALUE
- The VOS_STATUS code associated with performing the operation
+ The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
VOS_STATUS WLANSAP_SendAction( v_PVOID_t pvosGCtx, const tANI_U8 *pBuf,
tANI_U32 len, tANI_U16 wait )
@@ -2041,28 +2037,28 @@
FUNCTION WLANSAP_RemainOnChannel
- DESCRIPTION
+ DESCRIPTION
This api function provides to set Remain On channel on specified channel
for specified duration.
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
PARAMETERS
IN
pvosGCtx: Pointer to vos global context structure
- channel: Channel on which driver has to listen
+ channel: Channel on which driver has to listen
duration: Duration for which driver has to listen on specified channel
callback: Callback function to be called once Listen is done.
- pContext: Context needs to be called in callback function.
-
+ pContext: Context needs to be called in callback function.
+
RETURN VALUE
- The VOS_STATUS code associated with performing the operation
+ The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
VOS_STATUS WLANSAP_RemainOnChannel( v_PVOID_t pvosGCtx,
tANI_U8 channel, tANI_U32 duration,
@@ -2110,23 +2106,23 @@
FUNCTION WLANSAP_CancelRemainOnChannel
- DESCRIPTION
+ DESCRIPTION
This api cancel previous remain on channel request.
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
PARAMETERS
IN
pvosGCtx: Pointer to vos global context structure
-
+
RETURN VALUE
- The VOS_STATUS code associated with performing the operation
+ The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
VOS_STATUS WLANSAP_CancelRemainOnChannel( v_PVOID_t pvosGCtx )
{
@@ -2170,12 +2166,12 @@
FUNCTION WLANSAP_RegisterMgmtFrame
- DESCRIPTION
+ DESCRIPTION
HDD use this API to register specified type of frame with CORE stack.
On receiving such kind of frame CORE stack should pass this frame to HDD
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
PARAMETERS
@@ -2184,13 +2180,13 @@
frameType: frameType that needs to be registered with PE.
matchData: Data pointer which should be matched after frame type is matched.
matchLen: Length of the matchData
-
+
RETURN VALUE
- The VOS_STATUS code associated with performing the operation
+ The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
VOS_STATUS WLANSAP_RegisterMgmtFrame( v_PVOID_t pvosGCtx, tANI_U16 frameType,
tANI_U8* matchData, tANI_U16 matchLen )
@@ -2236,11 +2232,11 @@
FUNCTION WLANSAP_DeRegisterMgmtFrame
- DESCRIPTION
- This API is used to deregister previously registered frame.
+ DESCRIPTION
+ This API is used to deregister previously registered frame.
- DEPENDENCIES
- NA.
+ DEPENDENCIES
+ NA.
PARAMETERS
@@ -2249,13 +2245,13 @@
frameType: frameType that needs to be De-registered with PE.
matchData: Data pointer which should be matched after frame type is matched.
matchLen: Length of the matchData
-
+
RETURN VALUE
- The VOS_STATUS code associated with performing the operation
+ The VOS_STATUS code associated with performing the operation
VOS_STATUS_SUCCESS: Success
-
- SIDE EFFECTS
+
+ SIDE EFFECTS
============================================================================*/
VOS_STATUS WLANSAP_DeRegisterMgmtFrame( v_PVOID_t pvosGCtx, tANI_U16 frameType,
tANI_U8* matchData, tANI_U16 matchLen )