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

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

ath10k: fix hw roc expiration notifcation 



The expiration function must not be called when
roc is explicitly cancelled by mac80211. However
since fcf98446 ("ath10k: fix hw roc
expiration") the notification was never sent when
roc actually expired.

This fixes some P2P connection setup issues.

Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 424f2630

drivers/net/wireless/ath/ath10k/core.h

+1 −0
Original line number Diff line number Diff line
@@ -633,6 +633,7 @@ struct ath10k { 
		bool is_roc;

		int vdev_id;

		int roc_freq;

		bool roc_notify;

	} scan;



	struct {

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

+9 −3
Original line number Diff line number Diff line
@@ -3449,14 +3449,13 @@ void __ath10k_scan_finish(struct ath10k *ar) 
	case ATH10K_SCAN_IDLE:

		break;

	case ATH10K_SCAN_RUNNING:

		if (ar->scan.is_roc)

			ieee80211_remain_on_channel_expired(ar->hw);

		/* fall through */

	case ATH10K_SCAN_ABORTING:

		if (!ar->scan.is_roc)

			ieee80211_scan_completed(ar->hw,

						 (ar->scan.state ==

						  ATH10K_SCAN_ABORTING));

		else if (ar->scan.roc_notify)

			ieee80211_remain_on_channel_expired(ar->hw);

		/* fall through */

	case ATH10K_SCAN_STARTING:

		ar->scan.state = ATH10K_SCAN_IDLE;
@@ -5459,6 +5458,7 @@ static int ath10k_remain_on_channel(struct ieee80211_hw *hw, 
		ar->scan.is_roc = true;

		ar->scan.vdev_id = arvif->vdev_id;

		ar->scan.roc_freq = chan->center_freq;

		ar->scan.roc_notify = true;

		ret = 0;

		break;

	case ATH10K_SCAN_STARTING:
@@ -5522,7 +5522,13 @@ static int ath10k_cancel_remain_on_channel(struct ieee80211_hw *hw) 
	struct ath10k *ar = hw->priv;



	mutex_lock(&ar->conf_mutex);



	spin_lock_bh(&ar->data_lock);

	ar->scan.roc_notify = false;

	spin_unlock_bh(&ar->data_lock);



	ath10k_scan_abort(ar);



	mutex_unlock(&ar->conf_mutex);



	cancel_delayed_work_sync(&ar->scan.timeout);