From 6c70b0100513aa827a71960748352991c648f068 Mon Sep 17 00:00:00 2001 From: Sean Wang Date: Wed, 14 Jul 2021 04:16:00 +0800 Subject: [PATCH] mt76: mt7921: fix mgmt frame using unexpected bitrate Fix the current driver mgmt frame is not respecting the basic rates field provided by the AP and then unconditionally is using the lowest (1 or 6 Mbps) rate. For example, if the AP only supported basic rate {24, 36, 48, 54} Mbps, mt7921 cannot send mgmt frame with the rate not in the group. So, instead, we pick up the lowest basic rate the AP can support to send. Fixes: 163f4d22c118 ("mt76: mt7921: add MAC support") Signed-off-by: Sean Wang Signed-off-by: Felix Fietkau --- mt7921/mac.c | 5 +---- mt7921/mt7921.h | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/mt7921/mac.c b/mt7921/mac.c index 7fe2e3a5..a4ce3622 100644 --- a/mt7921/mac.c +++ b/mt7921/mac.c @@ -815,10 +815,7 @@ void mt7921_mac_write_txwi(struct mt7921_dev *dev, __le32 *txwi, /* hardware won't add HTC for mgmt/ctrl frame */ txwi[2] |= cpu_to_le32(MT_TXD2_HTC_VLD); - if (mphy->chandef.chan->band == NL80211_BAND_5GHZ) - rate = MT7921_5G_RATE_DEFAULT; - else - rate = MT7921_2G_RATE_DEFAULT; + rate = mt76_default_basic_rate(mphy, vif); val = MT_TXD6_FIXED_BW | FIELD_PREP(MT_TXD6_TX_RATE, rate); diff --git a/mt7921/mt7921.h b/mt7921/mt7921.h index 2d8bd6bf..be16d528 100644 --- a/mt7921/mt7921.h +++ b/mt7921/mt7921.h @@ -38,8 +38,6 @@ #define MT7921_CFEND_RATE_DEFAULT 0x49 /* OFDM 24M */ #define MT7921_CFEND_RATE_11B 0x03 /* 11B LP, 11M */ -#define MT7921_5G_RATE_DEFAULT 0x4b /* OFDM 6M */ -#define MT7921_2G_RATE_DEFAULT 0x0 /* CCK 1M */ #define MT7921_SKU_RATE_NUM 161 #define MT7921_SKU_MAX_DELTA_IDX MT7921_SKU_RATE_NUM