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

Commit b9d02ca2 authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Greg Kroah-Hartman
Browse files

wifi: ath9k: convert msecs to jiffies where needed 



[ Upstream commit 2aa083acea9f61be3280184384551178f510ff51 ]

Since 'ieee80211_queue_delayed_work()' expects timeout in
jiffies and not milliseconds, 'msecs_to_jiffies()' should
be used in 'ath_restart_work()' and '__ath9k_flush()'.

Fixes: d63ffc45 ("ath9k: rename tx_complete_work to hw_check_work")
Signed-off-by: default avatarDmitry Antipov <dmantipov@yandex.ru>
Acked-by: default avatarToke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20230613134655.248728-1-dmantipov@yandex.ru


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 33cc6e4e

drivers/net/wireless/ath/ath9k/main.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -200,7 +200,7 @@ void ath_cancel_work(struct ath_softc *sc) 
void ath_restart_work(struct ath_softc *sc)

void ath_restart_work(struct ath_softc *sc)

{

{

	ieee80211_queue_delayed_work(sc->hw, &sc->hw_check_work,

	ieee80211_queue_delayed_work(sc->hw, &sc->hw_check_work,

				     ATH_HW_CHECK_POLL_INT);

				     msecs_to_jiffies(ATH_HW_CHECK_POLL_INT));





	if (AR_SREV_9340(sc->sc_ah) || AR_SREV_9330(sc->sc_ah))

	if (AR_SREV_9340(sc->sc_ah) || AR_SREV_9330(sc->sc_ah))

		ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work,

		ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work,
@@ -2228,7 +2228,7 @@ void __ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop, 
	}

	}





	ieee80211_queue_delayed_work(hw, &sc->hw_check_work,

	ieee80211_queue_delayed_work(hw, &sc->hw_check_work,

				     ATH_HW_CHECK_POLL_INT);

				     msecs_to_jiffies(ATH_HW_CHECK_POLL_INT));

}

}





static bool ath9k_tx_frames_pending(struct ieee80211_hw *hw)

static bool ath9k_tx_frames_pending(struct ieee80211_hw *hw)