From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Fri, 28 Sep 2018 21:03:32 +0000 (+0200)
Subject: ath10k-ct: fix bandwidth conversion bug
X-Git-Tag: v19.07.0-rc1~2476
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b47a9cd4ba699342f7a74bf104dd65f4ca59e7ed;p=oweals%2Fopenwrt.git

ath10k-ct: fix bandwidth conversion bug

This backports a patch from the upstream kernel which was also shipped
previously in mac80211.
This fixes the following warning:
WARNING: CPU: 0 PID: 2881 at backports-4.19-rc5-1/net/wireless/util.c:1146 cfg80211_calculate_bitrate+0x238/0x348 [cfg80211]
invalid rate bw=2, mcs=0, nss=1

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/package/kernel/ath10k-ct/patches/210-ath10k-fix-recent-bandwidth-conversion-bug.patch b/package/kernel/ath10k-ct/patches/210-ath10k-fix-recent-bandwidth-conversion-bug.patch
new file mode 100644
index 0000000000..828e1e5a84
--- /dev/null
+++ b/package/kernel/ath10k-ct/patches/210-ath10k-fix-recent-bandwidth-conversion-bug.patch
@@ -0,0 +1,98 @@
+From 91493e8e10f0f495b04a5c32096d56ea1f254c93 Mon Sep 17 00:00:00 2001
+From: Christian Lamparter <chunkeey@gmail.com>
+Date: Wed, 28 Mar 2018 12:19:55 +0300
+Subject: [PATCH] ath10k: fix recent bandwidth conversion bug
+
+The commit "cfg80211: make RATE_INFO_BW_20 the default" changed
+the index of RATE_INFO_BW_20, but the updates to ath10k missed
+the special bandwidth calculation case in
+ath10k_update_per_peer_tx_stats().
+
+This will fix below warning,
+
+ WARNING: CPU: 0 PID: 609 at net/wireless/util.c:1254
+ cfg80211_calculate_bitrate+0x174/0x220
+ invalid rate bw=1, mcs=9, nss=2
+
+ (unwind_backtrace) from
+ (cfg80211_calculate_bitrate+0x174/0x220)
+ (cfg80211_calculate_bitrate) from
+ (nl80211_put_sta_rate+0x44/0x1dc)from
+ (nl80211_put_sta_rate) from
+ (nl80211_send_station+0x388/0xaf0)
+ (nl80211_get_station+0xa8/0xec)
+ [ end trace da8257d6a850e91a ]
+
+Fixes: 842be75c77cb ("cfg80211: make RATE_INFO_BW_20 the default")
+Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
+Signed-off-by: Anilkumar Kolli <akolli@codeaurora.org>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+---
+ ath10k-4.16/htt_rx.c | 42 ++++++++++++++++++--------------
+ 1 file changed, 24 insertions(+), 18 deletions(-)
+
+--- a/ath10k-4.16/htt_rx.c
++++ b/ath10k-4.16/htt_rx.c
+@@ -734,6 +734,28 @@ struct amsdu_subframe_hdr {
+ 
+ #define GROUP_ID_IS_SU_MIMO(x) ((x) == 0 || (x) == 63)
+ 
++static inline u8 ath10k_bw_to_mac80211_bw(u8 bw)
++{
++	u8 ret = 0;
++
++	switch (bw) {
++	case 0:
++		ret = RATE_INFO_BW_20;
++		break;
++	case 1:
++		ret = RATE_INFO_BW_40;
++		break;
++	case 2:
++		ret = RATE_INFO_BW_80;
++		break;
++	case 3:
++		ret = RATE_INFO_BW_160;
++		break;
++	}
++
++	return ret;
++}
++
+ static void ath10k_htt_rx_h_rates(struct ath10k *ar,
+ 				  struct ieee80211_rx_status *status,
+ 				  struct htt_rx_desc *rxd)
+@@ -836,23 +858,7 @@ static void ath10k_htt_rx_h_rates(struct
+ 		if (sgi)
+ 			status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
+ 
+-		switch (bw) {
+-		/* 20MHZ */
+-		case 0:
+-			break;
+-		/* 40MHZ */
+-		case 1:
+-			status->bw = RATE_INFO_BW_40;
+-			break;
+-		/* 80MHZ */
+-		case 2:
+-			status->bw = RATE_INFO_BW_80;
+-			break;
+-		case 3:
+-			status->bw = RATE_INFO_BW_160;
+-			break;
+-		}
+-
++		status->bw = ath10k_bw_to_mac80211_bw(bw);
+ 		status->encoding = RX_ENC_VHT;
+ 		break;
+ 	default:
+@@ -2623,7 +2629,7 @@ ath10k_update_per_peer_tx_stats(struct a
+ 		arsta->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;
+ 
+ 	arsta->txrate.nss = txrate.nss;
+-	arsta->txrate.bw = txrate.bw + RATE_INFO_BW_20;
++	arsta->txrate.bw = ath10k_bw_to_mac80211_bw(txrate.bw);
+ }
+ 
+ static void ath10k_htt_fetch_peer_stats(struct ath10k *ar,