diff options
| author | Sachin Ahuja <sahuja@qti.qualcomm.com> | 2014-04-01 19:12:40 +0530 |
|---|---|---|
| committer | Nandini Suresh <snandini@qca.qualcomm.com> | 2014-04-03 18:24:25 -0700 |
| commit | db2bb3794f03ab3183dfff43cef01e781cd2209a (patch) | |
| tree | 9f2306d720e1571f7062cf0deb33f2ffe2068f39 | |
| parent | 4871fad1b30e69743d01c0f8bfc5327cac291ce0 (diff) | |
qcacld: Limit the StaIdx from 41 to 33 in TXRX module.
Currently TXRX module assigns the StaIdx till 41.So when user gets
the STA info using get_sta_info some STA's are seen with StaIdx
greater than maxNumPeers that can be connected.Fix that.
Change-Id: I58d38de3f6d390a5f52fe168dc9fc537f4bf85eb
CRs-Fixed: 639800
| -rw-r--r-- | CORE/CLD_TXRX/TXRX/ol_txrx_types.h | 2 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_hostapd.c | 7 | ||||
| -rw-r--r-- | CORE/SAP/src/sapFsm.c | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/CORE/CLD_TXRX/TXRX/ol_txrx_types.h b/CORE/CLD_TXRX/TXRX/ol_txrx_types.h index 491cbabcffa5..8719c22c8e57 100644 --- a/CORE/CLD_TXRX/TXRX/ol_txrx_types.h +++ b/CORE/CLD_TXRX/TXRX/ol_txrx_types.h @@ -271,7 +271,7 @@ struct ol_tx_sched_t; typedef struct ol_tx_sched_t *ol_tx_sched_handle; #ifndef OL_TXRX_NUM_LOCAL_PEER_IDS -#define OL_TXRX_NUM_LOCAL_PEER_IDS 41 /* default */ +#define OL_TXRX_NUM_LOCAL_PEER_IDS 33 /* default */ #endif #ifndef ol_txrx_local_peer_id_t diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c index 93d22f5376c6..b17dc9e61f26 100644 --- a/CORE/HDD/src/wlan_hdd_hostapd.c +++ b/CORE/HDD/src/wlan_hdd_hostapd.c @@ -3693,14 +3693,19 @@ static int iw_softap_version(struct net_device *dev, VOS_STATUS hdd_softap_get_sta_info(hdd_adapter_t *pAdapter, v_U8_t *pBuf, int buf_len) { v_U8_t i; + v_U8_t maxSta = 0; int len = 0; const char sta_info_header[] = "staId staAddress"; + hdd_context_t *pHddCtx = (hdd_context_t*)(pAdapter->pHddCtx); len = scnprintf(pBuf, buf_len, sta_info_header); pBuf += len; buf_len -= len; - for (i = 0; i < WLAN_MAX_STA_COUNT; i++) + if(pHddCtx) + maxSta = pHddCtx->cfg_ini->maxNumberOfPeers; + + for (i = 0; i <= maxSta; i++) { if(pAdapter->aStaInfo[i].isUsed) { diff --git a/CORE/SAP/src/sapFsm.c b/CORE/SAP/src/sapFsm.c index c8ab1cb52715..a9b67ebc4d04 100644 --- a/CORE/SAP/src/sapFsm.c +++ b/CORE/SAP/src/sapFsm.c @@ -701,6 +701,7 @@ sapSignalHDDevent break; case eSAP_STA_ASSOC_EVENT: + case eSAP_STA_REASSOC_EVENT: { VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s", __func__, "eSAP_STA_ASSOC_EVENT"); |