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

Commit d4298a3a authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Kalle Valo
Browse files

ath10k: mac: remove unreachable negative return check 



wait_event_timeout(), introduced in 'commit 5e3dd157 ("ath10k: mac80211
driver for Qualcomm Atheros 802.11ac CQA98xx devices")' never returns < 0
so the only failure condition to be checked is ==0 (timeout). Further the
return type is long not int - an appropriately named variable is added
and the assignments fixed up.

Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 404d67ef

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

+5 −5
Original line number Diff line number Diff line
@@ -5566,7 +5566,7 @@ static void ath10k_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
{

	struct ath10k *ar = hw->priv;

	bool skip;

	int ret;

	long time_left;



	/* mac80211 doesn't care if we really xmit queued frames or not

	 * we'll collect those frames either way if we stop/delete vdevs */
@@ -5578,7 +5578,7 @@ static void ath10k_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	if (ar->state == ATH10K_STATE_WEDGED)

		goto skip;



	ret = wait_event_timeout(ar->htt.empty_tx_wq, ({

	time_left = wait_event_timeout(ar->htt.empty_tx_wq, ({

			bool empty;



			spin_lock_bh(&ar->htt.tx_lock);
@@ -5592,9 +5592,9 @@ static void ath10k_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
			(empty || skip);

		}), ATH10K_FLUSH_TIMEOUT_HZ);



	if (ret <= 0 || skip)

		ath10k_warn(ar, "failed to flush transmit queue (skip %i ar-state %i): %i\n",

			    skip, ar->state, ret);

	if (time_left == 0 || skip)

		ath10k_warn(ar, "failed to flush transmit queue (skip %i ar-state %i): %ld\n",

			    skip, ar->state, time_left);



skip:

	mutex_unlock(&ar->conf_mutex);