ath10k: fix offchannel cancel failures

When mac80211 requests driver to cancel a hw roc
the driver must not call the expired() callback or
else roc will fail in some cases depending on how
things get scheduled.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 770d2b5..8d07f77 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -2184,10 +2184,10 @@ void __ath10k_scan_finish(struct ath10k *ar)
        case ATH10K_SCAN_IDLE:
                break;
        case ATH10K_SCAN_RUNNING:
        case ATH10K_SCAN_IDLE:
                break;
        case ATH10K_SCAN_RUNNING:

-       case ATH10K_SCAN_ABORTING:

                if (ar->scan.is_roc)
                        ieee80211_remain_on_channel_expired(ar->hw);
                if (ar->scan.is_roc)
                        ieee80211_remain_on_channel_expired(ar->hw);

-               else
+       case ATH10K_SCAN_ABORTING:
+               if (!ar->scan.is_roc)

                        ieee80211_scan_completed(ar->hw,
                                                 (ar->scan.state ==
                                                  ATH10K_SCAN_ABORTING));
                        ieee80211_scan_completed(ar->hw,
                                                 (ar->scan.state ==
                                                  ATH10K_SCAN_ABORTING));