diff mbox

mt76x2: fix CCK protection control frame rate

Message ID cd663daf364d7967b3a8d9fd7f213139c959d0c1.1531385150.git.lorenzo.bianconi@redhat.com (mailing list archive)
State Accepted
Commit d0db2f7a02e45dd4791b70404bd90874b20c38a4
Delegated to: Kalle Valo
Headers show

Commit Message

Lorenzo Bianconi July 12, 2018, 8:50 a.m. UTC 
Use 11M as tx rate for CCK protection control frames

Fixes: 7bc04215a66b ("mt76: add driver code for MT76x2e")
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
---
 drivers/net/wireless/mediatek/mt76/mt76x2_init.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Comments

Kalle Valo July 30, 2018, 2:33 p.m. UTC | #1 
Lorenzo Bianconi <lorenzo.bianconi@redhat.com> wrote:

> Use 11M as tx rate for CCK protection control frames
> 
> Fixes: 7bc04215a66b ("mt76: add driver code for MT76x2e")
> Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>

Patch applied to wireless-drivers-next.git, thanks.

d0db2f7a02e4 mt76x2: fix CCK protection control frame rate
diff mbox

Patch

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2_init.c
index 79ab93613e06..8ab9788464e8 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_init.c
@@ -84,7 +84,13 @@  mt76x2_write_reg_pairs(struct mt76x2_dev *dev,
 static void
 mt76_write_mac_initvals(struct mt76x2_dev *dev)
 {
-#define DEFAULT_PROT_CFG				\
+#define DEFAULT_PROT_CFG_CCK				\
+	(FIELD_PREP(MT_PROT_CFG_RATE, 0x3) |		\
+	 FIELD_PREP(MT_PROT_CFG_NAV, 1) |		\
+	 FIELD_PREP(MT_PROT_CFG_TXOP_ALLOW, 0x3f) |	\
+	 MT_PROT_CFG_RTS_THRESH)
+
+#define DEFAULT_PROT_CFG_OFDM				\
 	(FIELD_PREP(MT_PROT_CFG_RATE, 0x2004) |		\
 	 FIELD_PREP(MT_PROT_CFG_NAV, 1) |			\
 	 FIELD_PREP(MT_PROT_CFG_TXOP_ALLOW, 0x3f) |	\
@@ -159,8 +165,8 @@  mt76_write_mac_initvals(struct mt76x2_dev *dev)
 		{ MT_HT_CTRL_CFG,		0x000001ff },
 	};
 	struct mt76x2_reg_pair prot_vals[] = {
-		{ MT_CCK_PROT_CFG,		DEFAULT_PROT_CFG },
-		{ MT_OFDM_PROT_CFG,		DEFAULT_PROT_CFG },
+		{ MT_CCK_PROT_CFG,		DEFAULT_PROT_CFG_CCK },
+		{ MT_OFDM_PROT_CFG,		DEFAULT_PROT_CFG_OFDM },
 		{ MT_MM20_PROT_CFG,		DEFAULT_PROT_CFG_20 },
 		{ MT_MM40_PROT_CFG,		DEFAULT_PROT_CFG_40 },
 		{ MT_GF20_PROT_CFG,		DEFAULT_PROT_CFG_20 },