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

Commit c1f41f52 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ath10k: Send vdev down if association to bss fails"

parents c0301d42 5753a503

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

+1 −0
Original line number Diff line number Diff line
@@ -958,6 +958,7 @@ struct ath10k { 
	struct fw_flag *fw_flags;

	/* set for bmi chip sets */

	bool is_bmi;

	enum ieee80211_sta_state sta_state;

	/* must be last */

	u8 drv_priv[0] __aligned(sizeof(void *));

};

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

+7 −2
Original line number Diff line number Diff line
@@ -5924,6 +5924,9 @@ static int ath10k_sta_state(struct ieee80211_hw *hw, 
	     new_state == IEEE80211_STA_NOTEXIST))

		cancel_work_sync(&arsta->update_wk);



	if (vif->type == NL80211_IFTYPE_STATION && new_state > ar->sta_state)

		ar->sta_state = new_state;



	mutex_lock(&ar->conf_mutex);



	if (old_state == IEEE80211_STA_NOTEXIST &&
@@ -7392,8 +7395,9 @@ ath10k_mac_op_unassign_vif_chanctx(struct ieee80211_hw *hw, 
		   ctx, arvif->vdev_id);



	WARN_ON(!arvif->is_started);



	if (vif->type == NL80211_IFTYPE_MONITOR) {

	if (vif->type == NL80211_IFTYPE_MONITOR ||

	    (vif->type == NL80211_IFTYPE_STATION &&

	     ar->sta_state < IEEE80211_STA_ASSOC)) {

		WARN_ON(!arvif->is_up);



		ret = ath10k_wmi_vdev_down(ar, arvif->vdev_id);
@@ -7409,6 +7413,7 @@ ath10k_mac_op_unassign_vif_chanctx(struct ieee80211_hw *hw, 
		ath10k_warn(ar, "failed to stop vdev %i: %d\n",

			    arvif->vdev_id, ret);



	ar->sta_state = IEEE80211_STA_NOTEXIST;

	arvif->is_started = false;



	mutex_unlock(&ar->conf_mutex);