commit 404df5be77dc5b738bc76e03530b6caabbdba56d
author Awk Jiang <awk.jiang@mediatek.com> Mon Jun 19 15:19:27 2017 +0800
committer Awk Jiang <awk.jiang@mediatek.com> Wed Jun 21 13:52:10 2017 +0800
tree 633be98da85dbf6297aa742a7137084eddf61985
parent ce5a13ba814cd3d4b02bd9dfa67cabfc34c8a816

[WCNCR00154466] misc: Change noise info source of driver "stat" result

[Description]
Change noise info source of iwpriv wlan0 driver "stat" result.
Use the "Idle average power" values from PHY CR as noise value.

Change-Id: I50f807e540d666edfcfba039965cb8e6e791b4af
Signed-off-by: Awk Jiang <awk.jiang@mediatek.com>
CR-Id: WCNCR00154466
Feature: misc

os/linux/gl_wext_priv.c

diff --git a/os/linux/gl_wext_priv.c b/os/linux/gl_wext_priv.c
index 7462cd3..e397f21 100644
--- a/os/linux/gl_wext_priv.c
+++ b/os/linux/gl_wext_priv.c
@@ -4051,6 +4051,11 @@
 	static UINT_32 au4AmpduTxAckSfCnt[ENUM_BAND_NUM] = {0};
 	P_RX_CTRL_T prRxCtrl;
 	UINT_32 u4InstantRxPer[ENUM_BAND_NUM];
+	PARAM_CUSTOM_SW_CTRL_STRUCT_T rSwCtrlInfo;
+	WLAN_STATUS rStatus = WLAN_STATUS_SUCCESS;
+	INT_16 i2Wf0AvgPwr;
+	INT_16 i2Wf1AvgPwr;
+	UINT_32 u4BufLen = 0;
 
 	ucSkipAr = prQueryStaStatistics->ucSkipAr;
 	prRxCtrl = &prAdapter->rRxCtrl;
@@ -4186,12 +4191,21 @@
 		RCPI_TO_dBm(prHwWlanInfo->rWtblRxCounter.ucRxRcpi2),
 		RCPI_TO_dBm(prHwWlanInfo->rWtblRxCounter.ucRxRcpi3));
 
-	i4BytesWritten += kalSnprintf(pcCommand + i4BytesWritten, i4TotalLen - i4BytesWritten,
-		"%-20s%s%d %d %d %d\n", "NOISE", " = ",
-		RCPI_TO_dBm(prHwWlanInfo->rWtblRxCounter.ucRxCC0),
-		RCPI_TO_dBm(prHwWlanInfo->rWtblRxCounter.ucRxCC1),
-		RCPI_TO_dBm(prHwWlanInfo->rWtblRxCounter.ucRxCC2),
-		RCPI_TO_dBm(prHwWlanInfo->rWtblRxCounter.ucRxCC3));
+	rSwCtrlInfo.u4Data = 0;
+	rSwCtrlInfo.u4Id = CMD_SW_DBGCTL_ADVCTL_GET_ID + 1;
+
+	rStatus = kalIoctl(prAdapter->prGlueInfo,
+			   wlanoidQuerySwCtrlRead,
+			   &rSwCtrlInfo, sizeof(rSwCtrlInfo), TRUE, TRUE, TRUE, &u4BufLen);
+
+	DBGLOG(REQ, LOUD, "rStatus %u, rSwCtrlInfo.u4Data 0x%x\n", rStatus, rSwCtrlInfo.u4Data);
+	if (rStatus == WLAN_STATUS_SUCCESS) {
+		i2Wf0AvgPwr = rSwCtrlInfo.u4Data & 0xFFFF;
+		i2Wf1AvgPwr = (rSwCtrlInfo.u4Data >> 16) & 0xFFFF;
+
+		i4BytesWritten += kalSnprintf(pcCommand + i4BytesWritten, i4TotalLen - i4BytesWritten,
+					"%-20s%s%d %d\n", "NOISE", " = ", i2Wf0AvgPwr, i2Wf1AvgPwr);
+	}
 
 	i4BytesWritten += kalSnprintf(pcCommand + i4BytesWritten, i4TotalLen - i4BytesWritten,
 		"%-20s%s%d\n", "LinkSpeed", " = ", u2LinkSpeed);