From b3f4542d3e58f08633859329042ba99b1e16b657 Mon Sep 17 00:00:00 2001 From: Krunal Soni Date: Mon, 24 Jul 2017 18:59:45 -0700 Subject: [PATCH] qcacld-3.0: Assign listen interval based on INI setting Current driver is assigning listening interval based on beacon interval value which is incorrect. Listen interval should be taken based on INI value. CRs-Fixed: 2080042 Change-Id: I0ad52a8042589604d51fc632fe3ce31547a26628 --- core/mac/src/pe/lim/lim_assoc_utils.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index a555f3233dd4..da6e9dde4f1b 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -3515,6 +3515,7 @@ tSirRetStatus lim_sta_send_add_bss(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, tDot11fIEVHTCaps *vht_caps = NULL; tDot11fIEVHTOperation *vht_oper = NULL; tAddStaParams *sta_context; + uint32_t listen_interval = WNI_CFG_LISTEN_INTERVAL_STADEF; /* Package SIR_HAL_ADD_BSS_REQ message parameters */ pAddBssParams = qdf_mem_malloc(sizeof(tAddBssParams)); @@ -3697,8 +3698,10 @@ tSirRetStatus lim_sta_send_add_bss(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, qdf_mem_copy(pAddBssParams->staContext.bssId, bssDescription->bssId, sizeof(tSirMacAddr)); - pAddBssParams->staContext.listenInterval = - bssDescription->beaconInterval; + if (wlan_cfg_get_int(pMac, WNI_CFG_LISTEN_INTERVAL, &listen_interval) != + eSIR_SUCCESS) + pe_err("Couldn't get LISTEN_INTERVAL"); + pAddBssParams->staContext.listenInterval = listen_interval; /* Fill Assoc id from the dph table */ pStaDs = dph_lookup_hash_entry(pMac, pAddBssParams->staContext.bssId, @@ -4033,6 +4036,7 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update uint8_t chanWidthSupp = 0; tDot11fIEVHTOperation *vht_oper = NULL; tDot11fIEVHTCaps *vht_caps = NULL; + uint32_t listen_interval = WNI_CFG_LISTEN_INTERVAL_STADEF; tpSirBssDescription bssDescription = &psessionEntry->pLimJoinReq->bssDescription; @@ -4241,9 +4245,10 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update qdf_mem_copy(pAddBssParams->staContext.bssId, bssDescription->bssId, sizeof(tSirMacAddr)); - pAddBssParams->staContext.listenInterval = - bssDescription->beaconInterval; - + if (wlan_cfg_get_int(pMac, WNI_CFG_LISTEN_INTERVAL, &listen_interval) != + eSIR_SUCCESS) + pe_err("Couldn't get LISTEN_INTERVAL"); + pAddBssParams->staContext.listenInterval = listen_interval; pAddBssParams->staContext.assocId = 0; pAddBssParams->staContext.uAPSD = 0; pAddBssParams->staContext.maxSPLen = 0;