wlan: Move staInfo to sapContext
Currently staInfo is maintained in pAdapter.As a
part of HT40 2.4Ghz SAP feature,40Mhz intolerent bit
needs to be checked for every STA that gets connected
to SAP.This bit is checked in SAP module but the
staInfo is present in pAdapter and pAdapter is not
accessible in SAP module.
So staInfo cannot be accessed in SAP module.
Changes are done to move the staInfo in sapContext.
CRs-Fixed: 752276
Change-Id: I07bdaf7ef40b405edd900467a7618e1fdd75d995
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index 96e6e32..8919893 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -607,16 +607,24 @@
{
v_U8_t staId = 0;
struct net_device *dev;
- dev = (struct net_device *)usrDataForCallback;
+ v_CONTEXT_t pVosContext = ( WLAN_HDD_GET_CTX(pHostapdAdapter))->pvosContext;
+ ptSapContext pSapCtx = NULL;
+ dev = (struct net_device *)usrDataForCallback;
+ pSapCtx = VOS_GET_SAP_CB(pVosContext);
+ if(pSapCtx == NULL){
+ VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
+ FL("psapCtx is NULL"));
+ return;
+ }
hddLog(LOGE, FL("Clearing all the STA entry...."));
for (staId = 0; staId < WLAN_MAX_STA_COUNT; staId++)
{
- if ( pHostapdAdapter->aStaInfo[staId].isUsed &&
+ if ( pSapCtx->aStaInfo[staId].isUsed &&
( staId != (WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter))->uBCStaId))
{
//Disconnect all the stations
- hdd_softap_sta_disassoc(pHostapdAdapter, &pHostapdAdapter->aStaInfo[staId].macAddrSTA.bytes[0]);
+ hdd_softap_sta_disassoc(pHostapdAdapter, &pSapCtx->aStaInfo[staId].macAddrSTA.bytes[0]);
}
}
}
@@ -674,6 +682,8 @@
hdd_context_t *pHddCtx;
hdd_scaninfo_t *pScanInfo = NULL;
struct iw_michaelmicfailure msg;
+ v_CONTEXT_t pVosContext = NULL;
+ ptSapContext pSapCtx = NULL;
dev = (struct net_device *)usrDataForCallback;
pHostapdAdapter = netdev_priv(dev);
@@ -685,7 +695,13 @@
"invalid adapter or adapter has invalid magic");
return eHAL_STATUS_FAILURE;
}
-
+ pVosContext = ( WLAN_HDD_GET_CTX(pHostapdAdapter))->pvosContext;
+ pSapCtx = VOS_GET_SAP_CB(pVosContext);
+ if(pSapCtx == NULL){
+ VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
+ FL("psapCtx is NULL"));
+ return eHAL_STATUS_FAILURE;
+ }
pHostapdState = WLAN_HDD_GET_HOSTAP_STATE_PTR(pHostapdAdapter);
pHddApCtx = WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter);
sapEvent = pSapEvent->sapHddEventCode;
@@ -932,17 +948,17 @@
if (0 != (WLAN_HDD_GET_CTX(pHostapdAdapter))->cfg_ini->nAPAutoShutOff)
{
- spin_lock_bh( &pHostapdAdapter->staInfo_lock );
+ spin_lock_bh( &pSapCtx->staInfo_lock );
// Start AP inactivity timer if no stations associated with it
for (i = 0; i < WLAN_MAX_STA_COUNT; i++)
{
- if (pHostapdAdapter->aStaInfo[i].isUsed && i != (WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter))->uBCStaId)
+ if (pSapCtx->aStaInfo[i].isUsed && i != (WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter))->uBCStaId)
{
bApActive = TRUE;
break;
}
}
- spin_unlock_bh( &pHostapdAdapter->staInfo_lock );
+ spin_unlock_bh( &pSapCtx->staInfo_lock );
if (bApActive == FALSE)
{
@@ -2115,14 +2131,15 @@
union iwreq_data *wrqu, char *extra)
{
hdd_adapter_t *pHostapdAdapter = (netdev_priv(dev));
- hdd_station_info_t *pStaInfo = pHostapdAdapter->aStaInfo;
+ hdd_station_info_t *pStaInfo = NULL;
char *buf;
int cnt = 0;
int left;
int ret = 0;
/* maclist_index must be u32 to match userspace */
u32 maclist_index;
-
+ v_CONTEXT_t pVosContext = NULL;
+ ptSapContext pSapCtx = NULL;
/*
* NOTE WELL: this is a "get" ioctl but it uses an even ioctl
* number, and even numbered iocts are supposed to have "set"
@@ -2150,12 +2167,19 @@
hddLog(LOG1, "%s: failed to allocate response buffer", __func__);
return -ENOMEM;
}
-
+ pVosContext = ( WLAN_HDD_GET_CTX(pHostapdAdapter))->pvosContext;
+ pSapCtx = VOS_GET_SAP_CB(pVosContext);
+ if(pSapCtx == NULL){
+ VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
+ FL("psapCtx is NULL"));
+ return -EFAULT;
+ }
+ pStaInfo = pSapCtx->aStaInfo;
/* start indexing beyond where the record count will be written */
maclist_index = sizeof(maclist_index);
left = wrqu->data.length - maclist_index;
- spin_lock_bh(&pHostapdAdapter->staInfo_lock);
+ spin_lock_bh(&pSapCtx->staInfo_lock);
while ((cnt < WLAN_MAX_STA_COUNT) && (left >= VOS_MAC_ADDR_SIZE)) {
if ((pStaInfo[cnt].isUsed) &&
(!IS_BROADCAST_MAC(pStaInfo[cnt].macAddrSTA.bytes))) {
@@ -2166,7 +2190,7 @@
}
cnt++;
}
- spin_unlock_bh(&pHostapdAdapter->staInfo_lock);
+ spin_unlock_bh(&pSapCtx->staInfo_lock);
*((u32 *)buf) = maclist_index;
wrqu->data.length = maclist_index;
@@ -3424,22 +3448,31 @@
int len = 0;
const char sta_info_header[] = "staId staAddress\n";
+ v_CONTEXT_t pVosContext = ( WLAN_HDD_GET_CTX(pAdapter))->pvosContext;
+ ptSapContext pSapCtx = NULL;
+ pSapCtx = VOS_GET_SAP_CB(pVosContext);
+ if(pSapCtx == NULL){
+ VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
+ FL("psapCtx is NULL"));
+ return VOS_STATUS_E_FAULT;
+ }
+
len = scnprintf(pBuf, buf_len, sta_info_header);
pBuf += len;
buf_len -= len;
for (i = 0; i < WLAN_MAX_STA_COUNT; i++)
{
- if(pAdapter->aStaInfo[i].isUsed)
+ if(pSapCtx->aStaInfo[i].isUsed)
{
len = scnprintf(pBuf, buf_len, "%5d .%02x:%02x:%02x:%02x:%02x:%02x\n",
- pAdapter->aStaInfo[i].ucSTAId,
- pAdapter->aStaInfo[i].macAddrSTA.bytes[0],
- pAdapter->aStaInfo[i].macAddrSTA.bytes[1],
- pAdapter->aStaInfo[i].macAddrSTA.bytes[2],
- pAdapter->aStaInfo[i].macAddrSTA.bytes[3],
- pAdapter->aStaInfo[i].macAddrSTA.bytes[4],
- pAdapter->aStaInfo[i].macAddrSTA.bytes[5]);
+ pSapCtx->aStaInfo[i].ucSTAId,
+ pSapCtx->aStaInfo[i].macAddrSTA.bytes[0],
+ pSapCtx->aStaInfo[i].macAddrSTA.bytes[1],
+ pSapCtx->aStaInfo[i].macAddrSTA.bytes[2],
+ pSapCtx->aStaInfo[i].macAddrSTA.bytes[3],
+ pSapCtx->aStaInfo[i].macAddrSTA.bytes[4],
+ pSapCtx->aStaInfo[i].macAddrSTA.bytes[5]);
pBuf += len;
buf_len -= len;
}