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

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

ath10k: remove unnecessary checks 



mac80211 interface iteration functions that were
used originally iterated over interfaces that
weren't re-added to the driver during recovery.

Since internal vif list is now used it's safe to
remove the safe-guard as internal vif list is
based on add/remove_interface function which
guarantees that vdev is created in FW before it is
iterated over.

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

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

+0 −21
Original line number Original line Diff line number Diff line
@@ -1964,13 +1964,6 @@ static int ath10k_config_ps(struct ath10k *ar) 




	lockdep_assert_held(&ar->conf_mutex);

	lockdep_assert_held(&ar->conf_mutex);





	/* During HW reconfiguration mac80211 reports all interfaces that were

	 * running until reconfiguration was started. Since FW doesn't have any

	 * vdevs at this point we must not iterate over this interface list.

	 * This setting will be updated upon add_interface(). */

	if (ar->state == ATH10K_STATE_RESTARTED)

		return 0;



	list_for_each_entry(arvif, &ar->arvifs, list) {

	list_for_each_entry(arvif, &ar->arvifs, list) {

		ret = ath10k_mac_vif_setup_ps(arvif);

		ret = ath10k_mac_vif_setup_ps(arvif);

		if (ret) {

		if (ret) {
@@ -2888,13 +2881,6 @@ static int ath10k_set_rts_threshold(struct ieee80211_hw *hw, u32 value) 
	struct ath10k_vif *arvif;

	struct ath10k_vif *arvif;

	int ret = 0;

	int ret = 0;





	/* During HW reconfiguration mac80211 reports all interfaces that were

	 * running until reconfiguration was started. Since FW doesn't have any

	 * vdevs at this point we must not iterate over this interface list.

	 * This setting will be updated upon add_interface(). */

	if (ar->state == ATH10K_STATE_RESTARTED)

		return 0;



	mutex_lock(&ar->conf_mutex);

	mutex_lock(&ar->conf_mutex);

	list_for_each_entry(arvif, &ar->arvifs, list) {

	list_for_each_entry(arvif, &ar->arvifs, list) {

		ath10k_dbg(ATH10K_DBG_MAC, "mac vdev %d rts threshold %d\n",

		ath10k_dbg(ATH10K_DBG_MAC, "mac vdev %d rts threshold %d\n",
@@ -2918,13 +2904,6 @@ static int ath10k_set_frag_threshold(struct ieee80211_hw *hw, u32 value) 
	struct ath10k_vif *arvif;

	struct ath10k_vif *arvif;

	int ret = 0;

	int ret = 0;





	/* During HW reconfiguration mac80211 reports all interfaces that were

	 * running until reconfiguration was started. Since FW doesn't have any

	 * vdevs at this point we must not iterate over this interface list.

	 * This setting will be updated upon add_interface(). */

	if (ar->state == ATH10K_STATE_RESTARTED)

		return 0;



	mutex_lock(&ar->conf_mutex);

	mutex_lock(&ar->conf_mutex);

	list_for_each_entry(arvif, &ar->arvifs, list) {

	list_for_each_entry(arvif, &ar->arvifs, list) {

		ath10k_dbg(ATH10K_DBG_MAC, "mac vdev %d fragmentation threshold %d\n",

		ath10k_dbg(ATH10K_DBG_MAC, "mac vdev %d fragmentation threshold %d\n",