mt76: mt7603: never use an 802.11b CF-End rate on 5GHz

Sometimes mt7615_mac_set_timing gets called while the slot time is still
configured to 20. Ensure that in this case it always uses the OFDM CFend
rate.

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
index 73c6a3ff399c9205ae9bd2b76f77c6275b269c8d..d34828715e1c0e16cd65e75073a8ae50cf666869 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
@@ -51,10 +51,11 @@ void mt7603_mac_set_timing(struct mt7603_dev *dev)
        int offset = 3 * dev->coverage_class;
        u32 reg_offset = FIELD_PREP(MT_TIMEOUT_VAL_PLCP, offset) |
                         FIELD_PREP(MT_TIMEOUT_VAL_CCA, offset);
+       bool is_5ghz = dev->mphy.chandef.chan->band == NL80211_BAND_5GHZ;
        int sifs;
        u32 val;
 
-       if (dev->mphy.chandef.chan->band == NL80211_BAND_5GHZ)
+       if (is_5ghz)
                sifs = 16;
        else
                sifs = 10;
@@ -71,7 +72,7 @@ void mt7603_mac_set_timing(struct mt7603_dev *dev)
                FIELD_PREP(MT_IFS_SIFS, sifs) |
                FIELD_PREP(MT_IFS_SLOT, dev->slottime));
 
-       if (dev->slottime < 20)
+       if (dev->slottime < 20 || is_5ghz)
                val = MT7603_CFEND_RATE_DEFAULT;
        else
                val = MT7603_CFEND_RATE_11B;