summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
diff options
context:
space:
mode:
authorFelix Fietkau2019-02-03 13:59:06 +0100
committerFelix Fietkau2019-02-18 19:54:33 +0100
commit20c06572c1910f2735cb8cc1fd5d413824a387ae (patch)
tree4b0d3874f0859e70ee897c3025fa79ce0f607533 /drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
parentmt76: mt76x2: avoid running DPD calibration if tx is blocked (diff)
downloadkernel-qcow2-linux-20c06572c1910f2735cb8cc1fd5d413824a387ae.tar.gz
kernel-qcow2-linux-20c06572c1910f2735cb8cc1fd5d413824a387ae.tar.xz
kernel-qcow2-linux-20c06572c1910f2735cb8cc1fd5d413824a387ae.zip
mt76: explicitly disable energy detect cca during scan
Avoid reusing the previous channel's tx blocking state Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'drivers/net/wireless/mediatek/mt76/mt76x02_mac.c')
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt76x02_mac.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
index 6bd7f87644a4..636e69a7a407 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
@@ -891,12 +891,12 @@ mt76x02_edcca_tx_enable(struct mt76x02_dev *dev, bool enable)
dev->ed_tx_blocked = !enable;
}
-void mt76x02_edcca_init(struct mt76x02_dev *dev)
+void mt76x02_edcca_init(struct mt76x02_dev *dev, bool enable)
{
dev->ed_trigger = 0;
dev->ed_silent = 0;
- if (dev->ed_monitor) {
+ if (dev->ed_monitor && enable) {
struct ieee80211_channel *chan = dev->mt76.chandef.chan;
u8 ed_th = chan->band == NL80211_BAND_5GHZ ? 0x0e : 0x20;