Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7305d3e0 authored by Michal Kazior's avatar Michal Kazior Committed by Kalle Valo
Browse files

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: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent dcca0bdb

drivers/net/wireless/ath/ath10k/mac.c

+2 −2
Original line number Diff line number Diff line
@@ -2184,10 +2184,10 @@ void __ath10k_scan_finish(struct ath10k *ar) 
	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);

		else

	case ATH10K_SCAN_ABORTING:

		if (!ar->scan.is_roc)

			ieee80211_scan_completed(ar->hw,

						 (ar->scan.state ==

						  ATH10K_SCAN_ABORTING));