aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-12-14 10:39:09 -0500
committerKalle Valo <kvalo@codeaurora.org>2018-01-08 12:25:48 -0500
commited6b43708116fae07a6e22104a38a510f45193d1 (patch)
tree613e63364a5ee6b1867b54859f342ee61c315635
parentc2d4c8723dbf73a5b37f94705da69130ccf604cf (diff)
mt76x2: increase OFDM SIFS time
Fixes throughput issues in combination with LDPC Signed-off-by: Felix Fietkau <nbd@nbd.name> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt76x2_phy.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_phy.c b/drivers/net/wireless/mediatek/mt76/mt76x2_phy.c
index 126497172284..fe3a4b6a19cc 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_phy.c
@@ -325,8 +325,7 @@ mt76x2_configure_tx_delay(struct mt76x2_dev *dev, enum nl80211_band band, u8 bw)
325 mt76_wr(dev, MT_TX_SW_CFG0, cfg0); 325 mt76_wr(dev, MT_TX_SW_CFG0, cfg0);
326 mt76_wr(dev, MT_TX_SW_CFG1, cfg1); 326 mt76_wr(dev, MT_TX_SW_CFG1, cfg1);
327 327
328 mt76_rmw_field(dev, MT_XIFS_TIME_CFG, MT_XIFS_TIME_CFG_CCK_SIFS, 328 mt76_rmw_field(dev, MT_XIFS_TIME_CFG, MT_XIFS_TIME_CFG_OFDM_SIFS, 15);
329 13 + (bw ? 1 : 0));
330} 329}
331 330
332static void 331static void
@@ -559,7 +558,6 @@ int mt76x2_phy_set_channel(struct mt76x2_dev *dev,
559 u8 bw, bw_index; 558 u8 bw, bw_index;
560 int freq, freq1; 559 int freq, freq1;
561 int ret; 560 int ret;
562 u8 sifs = 13;
563 561
564 dev->cal.channel_cal_done = false; 562 dev->cal.channel_cal_done = false;
565 freq = chandef->chan->center_freq; 563 freq = chandef->chan->center_freq;
@@ -611,11 +609,6 @@ int mt76x2_phy_set_channel(struct mt76x2_dev *dev,
611 MT_EXT_CCA_CFG_CCA_MASK), 609 MT_EXT_CCA_CFG_CCA_MASK),
612 ext_cca_chan[ch_group_index]); 610 ext_cca_chan[ch_group_index]);
613 611
614 if (chandef->width >= NL80211_CHAN_WIDTH_40)
615 sifs++;
616
617 mt76_rmw_field(dev, MT_XIFS_TIME_CFG, MT_XIFS_TIME_CFG_OFDM_SIFS, sifs);
618
619 ret = mt76x2_mcu_set_channel(dev, channel, bw, bw_index, scan); 612 ret = mt76x2_mcu_set_channel(dev, channel, bw, bw_index, scan);
620 if (ret) 613 if (ret)
621 return ret; 614 return ret;