lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0115/1039] wcn36xx: fix RX BD rate mapping for 5GHz legacy rates
    Date
    From: Benjamin Li <benl@squareup.com>

    [ 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: 6ea131acea98 ("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>
    ---
    drivers/net/wireless/ath/wcn36xx/txrx.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    diff --git a/drivers/net/wireless/ath/wcn36xx/txrx.c b/drivers/net/wireless/ath/wcn36xx/txrx.c
    index f0a9f069a92a9..dd58dde8c8363 100644
    --- a/drivers/net/wireless/ath/wcn36xx/txrx.c
    +++ b/drivers/net/wireless/ath/wcn36xx/txrx.c
    @@ -272,7 +272,6 @@ int wcn36xx_rx_skb(struct wcn36xx *wcn, struct sk_buff *skb)
    const struct wcn36xx_rate *rate;
    struct ieee80211_hdr *hdr;
    struct wcn36xx_rx_bd *bd;
    - struct ieee80211_supported_band *sband;
    u16 fc, sn;

    /*
    @@ -350,12 +349,11 @@ int wcn36xx_rx_skb(struct wcn36xx *wcn, struct sk_buff *skb)
    status.enc_flags = rate->encoding_flags;
    status.bw = rate->bw;
    status.rate_idx = rate->mcs_or_legacy_index;
    - sband = wcn->hw->wiphy->bands[status.band];
    status.nss = 1;

    if (status.band == NL80211_BAND_5GHZ &&
    status.encoding == RX_ENC_LEGACY &&
    - status.rate_idx >= sband->n_bitrates) {
    + status.rate_idx >= 4) {
    /* no dsss rates in 5Ghz rates table */
    status.rate_idx -= 4;
    }
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 22:54    [W:2.735 / U:1.596 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site