diff options
Diffstat (limited to 'wilink_6_1/stad')
| -rw-r--r-- | wilink_6_1/stad/src/Connection_Managment/admCtrlWpa.c | 3 | ||||
| -rw-r--r-- | wilink_6_1/stad/src/Connection_Managment/connInfra.c | 2 | ||||
| -rw-r--r-- | wilink_6_1/stad/src/Data_link/rx.c | 13 |
3 files changed, 9 insertions, 9 deletions
diff --git a/wilink_6_1/stad/src/Connection_Managment/admCtrlWpa.c b/wilink_6_1/stad/src/Connection_Managment/admCtrlWpa.c index 3a92561..77041ba 100644 --- a/wilink_6_1/stad/src/Connection_Managment/admCtrlWpa.c +++ b/wilink_6_1/stad/src/Connection_Managment/admCtrlWpa.c @@ -1251,7 +1251,8 @@ TI_STATUS admCtrlWpa_parseIe(admCtrl_t *pAdmCtrl, TI_UINT8 *pWpaIe, wpaIeData_t curWpaIe +=4; /* Include all AP key management supported suites in the wpaData structure */ - pWpaData->KeyMngSuite[index+1] = curKeyMngSuite; + if ((index+1) < MAX_WPA_KEY_MNG_SUITES) + pWpaData->KeyMngSuite[index+1] = curKeyMngSuite; } pWpaData->KeyMngSuite[0] = maxKeyMngSuite; diff --git a/wilink_6_1/stad/src/Connection_Managment/connInfra.c b/wilink_6_1/stad/src/Connection_Managment/connInfra.c index 866b0fe..b48acdf 100644 --- a/wilink_6_1/stad/src/Connection_Managment/connInfra.c +++ b/wilink_6_1/stad/src/Connection_Managment/connInfra.c @@ -856,7 +856,7 @@ static TI_STATUS prepare_send_disconnect(void *pData) /* Start the disconnect complete time out timer. Disconect Complete event, which stops the timer. */ - tmr_StartTimer (pConn->hConnTimer, conn_timeout, (TI_HANDLE)pConn, DISCONNECT_TIMEOUT_MSEC * 4, TI_FALSE); + tmr_StartTimer (pConn->hConnTimer, conn_timeout, (TI_HANDLE)pConn, DISCONNECT_TIMEOUT_MSEC, TI_FALSE); /* FW will send the disconn frame according to disConnType */ TWD_CmdFwDisconnect (pConn->hTWD, pConn->disConnType, pConn->disConnReasonToAP); diff --git a/wilink_6_1/stad/src/Data_link/rx.c b/wilink_6_1/stad/src/Data_link/rx.c index 52436fe..beb234f 100644 --- a/wilink_6_1/stad/src/Data_link/rx.c +++ b/wilink_6_1/stad/src/Data_link/rx.c @@ -39,28 +39,28 @@ /***************************************************************************/ #define __FILE_ID__ FILE_ID_54 #include "tidef.h" -#include "paramOut.h" +#include "paramOut.h" #include "rx.h" #include "osApi.h" #include "timer.h" #include "DataCtrl_Api.h" #include "Ctrl.h" #include "802_11Defs.h" -#include "Ethernet.h" +#include "Ethernet.h" #include "report.h" #include "rate.h" #include "mlmeApi.h" #include "rsnApi.h" #include "smeApi.h" #include "siteMgrApi.h" -#include "GeneralUtil.h" +#include "GeneralUtil.h" #include "EvHandler.h" #ifdef XCC_MODULE_INCLUDED #include "XCCMngr.h" #endif #include "TWDriver.h" #include "RxBuf.h" -#include "DrvMainModules.h" +#include "DrvMainModules.h" #include "bmtrace_api.h" #include "PowerMgr_API.h" @@ -184,7 +184,7 @@ void rxData_init (TStadHandlesList *pStadHandles) pRxData->hEvHandler = pStadHandles->hEvHandler; pRxData->hTimer = pStadHandles->hTimer; pRxData->hPowerMgr = pStadHandles->hPowerMgr; - + pRxData->rxDataExcludeUnencrypted = DEF_EXCLUDE_UNENCYPTED; pRxData->rxDataExludeBroadcastUnencrypted = DEF_EXCLUDE_UNENCYPTED; pRxData->rxDataEapolDestination = DEF_EAPOL_DESTINATION; @@ -239,7 +239,7 @@ TI_STATUS rxData_SetDefaults (TI_HANDLE hRxData, rxDataInitParams_t * rxDataInit { rxData_t *pRxData = (rxData_t *)hRxData; int i; - + /* init rx data filters */ pRxData->filteringEnabled = rxDataInitParams->rxDataFiltersEnabled; pRxData->filteringDefaultAction = rxDataInitParams->rxDataFiltersDefaultAction; @@ -814,7 +814,6 @@ static TI_STATUS rxData_addRxDataFilter (TI_HANDLE hRxData, TRxDataFilterRequest lenFieldPatterns, fieldPatterns); - return TI_OK; } /*************************************************************************** |