1 From: Christian Lamparter <chunkeey@gmail.com>
2 Date: Wed, 1 Nov 2017 21:01:57 +0100
3 Subject: [PATCH] ath10k: fix recent bandwidth conversion bug
5 The commit "cfg80211: make RATE_INFO_BW_20 the default" changed
6 the index of RATE_INFO_BW_20, but the updates to ath10k missed
7 the special bandwidth calculation case in
8 ath10k_update_per_peer_tx_stats().
10 Fixes: 842be75c77cb ("cfg80211: make RATE_INFO_BW_20 the default")
11 Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
12 Patchwork-Id: 10037035
13 Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
16 --- a/drivers/net/wireless/ath/ath10k/htt_rx.c
17 +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
18 @@ -592,6 +592,9 @@ struct amsdu_subframe_hdr {
20 #define GROUP_ID_IS_SU_MIMO(x) ((x) == 0 || (x) == 63)
22 +static const u8 ath10k_bw_to_mac80211[] = { RATE_INFO_BW_20, RATE_INFO_BW_40,
23 + RATE_INFO_BW_80, RATE_INFO_BW_160 };
25 static void ath10k_htt_rx_h_rates(struct ath10k *ar,
26 struct ieee80211_rx_status *status,
27 struct htt_rx_desc *rxd)
28 @@ -694,23 +697,7 @@ static void ath10k_htt_rx_h_rates(struct
30 status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
38 - status->bw = RATE_INFO_BW_40;
42 - status->bw = RATE_INFO_BW_80;
45 - status->bw = RATE_INFO_BW_160;
49 + status->bw = ath10k_bw_to_mac80211[bw];
50 status->encoding = RX_ENC_VHT;
53 @@ -2297,7 +2284,7 @@ ath10k_update_per_peer_tx_stats(struct a
54 arsta->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;
56 arsta->txrate.nss = txrate.nss;
57 - arsta->txrate.bw = txrate.bw + RATE_INFO_BW_20;
58 + arsta->txrate.bw = ath10k_bw_to_mac80211[txrate.bw];
61 static void ath10k_htt_fetch_peer_stats(struct ath10k *ar,