On Mon, Oct 29, 2018 at 11:16:53AM +0100, Stanislaw Gruszka wrote:
> If we are associated and scanning is performed , sw_scan_complete callback
> is done after we get back to operating channel, so we do not perform
> phy calibration and queue cal work. Fix this by run calibration from
> sw_scan_complete().
>
> Fixes: bbd10586f0df ("mt76x0: phy: do not run calibration during channel
> switch")
> Signed-off-by: Stanislaw Gruszka <[email protected]>
> ---
> This is for 4.20
>
> drivers/net/wireless/mediatek/mt76/mt76x0/main.c | 19 +++++++++++++++++++
> drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h | 2 ++
> drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 2 +-
> drivers/net/wireless/mediatek/mt76/mt76x0/usb.c | 2 +-
> 4 files changed, 23 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/main.c
> b/drivers/net/wireless/mediatek/mt76/mt76x0/main.c
> index a803a9b6a4c5..896a9d46bb76 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76x0/main.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/main.c
> @@ -78,3 +78,22 @@ int mt76x0_config(struct ieee80211_hw *hw, u32 changed)
> return ret;
> }
> EXPORT_SYMBOL_GPL(mt76x0_config);
> +
> +void mt76x0_sw_scan_complete(struct ieee80211_hw *hw,
> + struct ieee80211_vif *vif)
> +{
> + struct mt76x02_dev *dev = hw->priv;
> +
> + mutex_lock(&dev->mt76.mutex);
> + if (vif->bss_conf.assoc) {
> + mt76x0_phy_calibrate(dev, false);
> + mt76x0_phy_set_txpower(dev);
Actually I don't think this part is needed, it is done after channel
switch just before we associate, and that seems to be sufficient.
> +
> + ieee80211_queue_delayed_work(dev->mt76.hw, &dev->cal_work,
> + MT_CALIBRATE_INTERVAL);
We just have to schedule this work, and mt76x2 suffer from similar
issue, so this can be done in mt76x02_sw_scan_complete(). Will
post v2.
Thanks
Stanislaw
