diff options
| -rw-r--r-- | core/sme/src/csr/csr_api_roam.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index bab686adc0e9..897dd5264d68 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -4311,14 +4311,19 @@ QDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac, * Join timeout: if we find a BeaconInterval in the BssDescription, * then set the Join Timeout to be 10 x the BeaconInterval. */ - if (pBssDesc->beaconInterval) + if (pBssDesc->beaconInterval) { /* Make sure it is bigger than the minimal */ pBssConfig->uJoinTimeOut = QDF_MAX(10 * pBssDesc->beaconInterval, CSR_JOIN_FAILURE_TIMEOUT_MIN); - else + /* make sure it is less than max allowed */ + pBssConfig->uJoinTimeOut = + QDF_MIN(pBssConfig->uJoinTimeOut, + WNI_CFG_JOIN_FAILURE_TIMEOUT_STAMAX); + } else { pBssConfig->uJoinTimeOut = CSR_JOIN_FAILURE_TIMEOUT_DEFAULT; + } /* validate CB */ if ((pBssConfig->uCfgDot11Mode == eCSR_CFG_DOT11_MODE_11N) || (pBssConfig->uCfgDot11Mode == eCSR_CFG_DOT11_MODE_11AC) |