Received-SPF: pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   greearb@candelatech.com
To:     linux-wireless@vger.kernel.org
Cc:     Ben Greear <greearb@candelatech.com>
Subject: [PATCH] ax200:  Fix avg-power report.
Date:   Tue, 26 Nov 2019 13:47:44 -0800
Message-Id: <20191126214744.1283-1-greearb@candelatech.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk

From: Ben Greear <greearb@candelatech.com>

On AX200, the average power was showing possitive instead of negative, but
otherwise matched the expected RSSI.  I think that we just need to flip
the value to negative before giving to mac80211.

Signed-off-by: Ben Greear <greearb@candelatech.com>
---
 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 1bff94c3dd72..2876db1b1d17 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -4948,7 +4948,15 @@ static void iwl_mvm_mac_sta_statistics(struct ieee80211_hw *hw,
 	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);
 
 	if (mvmsta->avg_energy) {
-		sinfo->signal_avg = mvmsta->avg_energy;
+		/* signal_avg is s8, mvsta->avg_energy is u8.  At least on AX200,
+		 * avg_energy is RSSI but missing the minus sign.
+		 */
+		if (mvmsta->avg_energy & 0x80) {
+			sinfo->signal_avg = mvmsta->avg_energy;
+		}
+		else {
+			sinfo->signal_avg = -((s8)(mvmsta->avg_energy));
+		}
 		sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG);
 	}
 
-- 
2.20.1