xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wcn36xx: fix RX BD rate mapping for 5GHz legacy rates

Browse Source 
[ Upstream commit cfdf6b19e750f7de8ae71a26932f63b52e3bf74c ]

The linear mapping between the BD rate field and the driver's 5GHz
legacy rates table (wcn_5ghz_rates) does not only apply for the latter
four rates -- it applies to all eight rates.

Fixes: 6ea131acea ("wcn36xx: Fix warning due to bad rate_idx")
Signed-off-by: Benjamin Li <benl@squareup.com>
Tested-by: Loic Poulain <loic.poulain@linaro.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20211104010548.1107405-3-benl@squareup.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Benjamin Li
2021-11-03 18:05:48 -07:00
committed by Greg Kroah-Hartman
parent 22406ed4e3
commit 2fe056d979
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/ath/wcn36xx/txrx.c
View File

@@ -237,7 +237,6 @@ int wcn36xx_rx_skb(struct wcn36xx *wcn, struct sk_buff *skb)
const struct wcn36xx_rate *rate; const struct wcn36xx_rate *rate;
struct ieee80211_hdr *hdr; struct ieee80211_hdr *hdr;
struct wcn36xx_rx_bd *bd; struct wcn36xx_rx_bd *bd;
struct ieee80211_supported_band *sband;
u16 fc, sn; u16 fc, sn;
/* /*
@@ -295,12 +294,11 @@ int wcn36xx_rx_skb(struct wcn36xx *wcn, struct sk_buff *skb)
status.enc_flags = rate->encoding_flags; status.enc_flags = rate->encoding_flags;
status.bw = rate->bw; status.bw = rate->bw;
status.rate_idx = rate->mcs_or_legacy_index; status.rate_idx = rate->mcs_or_legacy_index;
sband = wcn->hw->wiphy->bands[status.band];
status.nss = 1; status.nss = 1;
if (status.band == NL80211_BAND_5GHZ && if (status.band == NL80211_BAND_5GHZ &&
status.encoding == RX_ENC_LEGACY && status.encoding == RX_ENC_LEGACY &&
status.rate_idx >= sband->n_bitrates) { status.rate_idx >= 4) {
/* no dsss rates in 5Ghz rates table */ /* no dsss rates in 5Ghz rates table */
status.rate_idx -= 4; status.rate_idx -= 4;
} }