diff options
| author | Felix Fietkau <nbd@nbd.name> | 2019-02-03 13:59:06 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2019-02-18 19:54:33 +0100 |
| commit | 20c06572c1910f2735cb8cc1fd5d413824a387ae (patch) | |
| tree | 4b0d3874f0859e70ee897c3025fa79ce0f607533 /drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c | |
| parent | 1564fa92fbf92abdc5bb82c006956826718ced5e (diff) | |
| download | linux-next-20c06572c1910f2735cb8cc1fd5d413824a387ae.tar.gz | |
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/mt76x2/pci_phy.c')
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c index 65ed62229a5b..97ec575699d0 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c @@ -240,8 +240,10 @@ int mt76x2_phy_set_channel(struct mt76x02_dev *dev, mt76_wr(dev, MT_BBP(AGC, 2), 0x00007070); mt76_wr(dev, MT_TXOP_CTRL_CFG, 0x04101B3F); - if (scan) + if (scan) { + mt76x02_edcca_init(dev, false); return 0; + } mt76x2_phy_channel_calibrate(dev, true); mt76x02_init_agc_gain(dev); @@ -254,7 +256,7 @@ int mt76x2_phy_set_channel(struct mt76x02_dev *dev, 0x38); } - mt76x02_edcca_init(dev); + mt76x02_edcca_init(dev, true); ieee80211_queue_delayed_work(mt76_hw(dev), &dev->cal_work, MT_CALIBRATE_INTERVAL); |