commit 8c451f8dda56c7f20ad77bdca0d74dee642c19ae
author CNSS_WLAN Service <cnssbldsw@qualcomm.com> Wed Jul 26 14:02:52 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jul 26 14:02:52 2017 -0700
tree 5744bf268dc4c8dbacc0f2d5941dcf4318a79d89
parent 1499fbb8af8f22c211713769d013cdea0313a072
parent b3f4542d3e58f08633859329042ba99b1e16b657

Merge "qcacld-3.0: Assign listen interval based on INI setting" into wlan-cld3.driver.lnx.2.0-dev

core/mac/src/pe/lim/lim_assoc_utils.c

diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index a555f32..da6e9dd 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 @@
 	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 @@
 
 	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 @@
 	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 @@
 
 	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;