commit 63e5e836e38cc317aaae2a05167af7719f9799e1
author Glenn Tung <glenn.tung@mediatek.com> Fri Dec 15 11:42:38 2017 +0800
committer Glenn Tung <glenn.tung@mediatek.com> Fri Dec 15 13:23:21 2017 +0800
tree e11cd70bb601ee3c1f4aaf372fb74395a8485432
parent bf755c5c55601233b8ff5afa3fa6b2abf2cc18d3

[WCNCR00155320] misc: Fix incorrect bandwidth of Tx MCS distribution

[Description]
1. Fix incorrect bandwidth of Tx MCS distribution
2. Fix crash issue in Rx MCS collection timeout function

Change-Id: I5e1f9f5f8c600e88948db0bc1746bdde6cb2cba4
Signed-off-by: Glenn Tung <glenn.tung@mediatek.com>
CR-Id: WCNCR00155320
Feature: misc
Reviewed-on: http://gerrit.mediatek.inc:8080/1252507
CheckPatch: Check Patch <srv_checkpatch@mediatek.com>
Reviewed-by: George Kuo <george.kuo@mediatek.com>
Reviewed-by: ZD Hu <zd.hu@mediatek.com>
Build: srv_neptune_adm <srv_neptune_adm@mediatek.com>

mgmt/ais_fsm.c

diff --git a/mgmt/ais_fsm.c b/mgmt/ais_fsm.c
index fce992f..ccaa072 100644
--- a/mgmt/ais_fsm.c
+++ b/mgmt/ais_fsm.c
@@ -3137,7 +3137,12 @@
 VOID aisRxMcsCollectionTimeout(IN P_ADAPTER_T prAdapter, ULONG ulParamPtr)
 {
 	static UINT_8 ucSmapleCnt;
-	UINT_8 ucStaIdx = prAdapter->prAisBssInfo->prStaRecOfAP->ucIndex;
+	UINT_8 ucStaIdx = 0;
+
+	if (prAdapter->prAisBssInfo->prStaRecOfAP == NULL)
+		return;
+
+	ucStaIdx = prAdapter->prAisBssInfo->prStaRecOfAP->ucIndex;
 
 	if (prAdapter->arStaRec[ucStaIdx].fgIsValid && prAdapter->arStaRec[ucStaIdx].fgIsInUse) {
 		prAdapter->arStaRec[ucStaIdx].au4RxVect0Que[ucSmapleCnt] = prAdapter->arStaRec[ucStaIdx].u4RxVector0;

os/linux/gl_wext_priv.c

diff --git a/os/linux/gl_wext_priv.c b/os/linux/gl_wext_priv.c
index 241f047..fa3571e 100644
--- a/os/linux/gl_wext_priv.c
+++ b/os/linux/gl_wext_priv.c
@@ -8839,6 +8839,7 @@
 	if (!prHwWlanInfo)
 		return -1;
 
+	prHwWlanInfo->u4Index = prGlueInfo->prAdapter->prAisBssInfo->prStaRecOfAP->ucWlanIndex;
 	rStatus = kalIoctl(prGlueInfo,
 				   wlanoidQueryWlanInfo,
 				   prHwWlanInfo, sizeof(PARAM_HW_WLAN_INFO_T), TRUE, TRUE, TRUE, &u4BufLen);