From: Felix Fietkau <nbd@nbd.name>
To: linux-wireless@vger.kernel.org
Subject: [PATCH 4/9] mt76: mt7615: never use an 802.11b CF-End rate on 5GHz
Date: Wed, 22 Apr 2020 18:04:32 +0200 [thread overview]
Message-ID: <20200422160437.99466-4-nbd@nbd.name> (raw)
In-Reply-To: <20200422160437.99466-1-nbd@nbd.name>
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>
---
drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index 396f11e1bbf6..63c7acfd4cc2 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -117,8 +117,9 @@ void mt7615_mac_set_timing(struct mt7615_phy *phy)
u32 ofdm = FIELD_PREP(MT_TIMEOUT_VAL_PLCP, 60) |
FIELD_PREP(MT_TIMEOUT_VAL_CCA, 24);
int sifs, offset;
+ bool is_5ghz = phy->mt76->chandef.chan->band == NL80211_BAND_5GHZ;
- if (phy->mt76->chandef.chan->band == NL80211_BAND_5GHZ)
+ if (is_5ghz)
sifs = 16;
else
sifs = 10;
@@ -151,7 +152,7 @@ void mt7615_mac_set_timing(struct mt7615_phy *phy)
FIELD_PREP(MT_IFS_SIFS, sifs) |
FIELD_PREP(MT_IFS_SLOT, phy->slottime));
- if (phy->slottime < 20)
+ if (phy->slottime < 20 || is_5ghz)
val = MT7615_CFEND_RATE_DEFAULT;
else
val = MT7615_CFEND_RATE_11B;
--
2.24.0
next prev parent reply other threads:[~2020-04-22 16:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-22 16:04 [PATCH 1/9] mt76: mt7615: fix sta ampdu factor for VHT Felix Fietkau
2020-04-22 16:04 ` [PATCH 2/9] mt76: fix A-MPDU density handling Felix Fietkau
2020-04-22 16:04 ` [PATCH 3/9] mt76: mt7615: use larger rx buffers if VHT is supported Felix Fietkau
2020-04-22 16:04 ` Felix Fietkau [this message]
2020-04-22 16:04 ` [PATCH 5/9] mt76: mt7603: never use an 802.11b CF-End rate on 5GHz Felix Fietkau
2020-04-22 16:04 ` [PATCH 6/9] mt76: mt7615: adjust timing in mt7615_mac_set_timing to match fw/hw values Felix Fietkau
2020-04-22 16:04 ` [PATCH 7/9] mt76: mt7615: do not adjust MAC timings if the device is not running Felix Fietkau
2020-04-22 16:04 ` [PATCH 8/9] mt76: mt7615: fix tx status rate index calculation Felix Fietkau
2020-04-22 16:04 ` [PATCH 9/9] mt76: mt7603: " Felix Fietkau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200422160437.99466-4-nbd@nbd.name \
--to=nbd@nbd.name \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox