mt76: mt7615: fix MT7615_CFEND_RATE_DEFAULT value

Fix default CFEND_RATE and replace hardcode values.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/init.c b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
index 17a4055..a2405e1 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
@@ -35,8 +35,8 @@ static void mt7615_mac_init(struct mt7615_dev *dev)
        mt76_wr(dev, MT_TMAC_TRCR1, val);
 
        val = MT_AGG_ACR_PKT_TIME_EN | MT_AGG_ACR_NO_BA_AR_RULE |
-             FIELD_PREP(MT_AGG_ACR_CFEND_RATE, 0x49) | /* 24M */
-             FIELD_PREP(MT_AGG_ACR_BAR_RATE, 0x4b); /* 6M */
+             FIELD_PREP(MT_AGG_ACR_CFEND_RATE, MT7615_CFEND_RATE_DEFAULT) |
+             FIELD_PREP(MT_AGG_ACR_BAR_RATE, MT7615_BAR_RATE_DEFAULT);
        mt76_wr(dev, MT_AGG_ACR0, val);
        mt76_wr(dev, MT_AGG_ACR1, val);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
index 554bd04..48810ed 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
@@ -40,7 +40,8 @@
 #define MT_CHFREQ_DBDC_IDX     BIT(6)
 #define MT_CHFREQ_SEQ          GENMASK(5, 0)
 
-#define MT7615_CFEND_RATE_DEFAULT      0x69 /* chip default (24M) */
+#define MT7615_BAR_RATE_DEFAULT                0x4b /* OFDM 6M */
+#define MT7615_CFEND_RATE_DEFAULT      0x49 /* OFDM 24M */
 #define MT7615_CFEND_RATE_11B          0x03 /* 11B LP, 11M */
 
 struct mt7615_vif;