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()'.
Signed-off-by: Dmitry Antipov <[email protected]>
---
drivers/net/wireless/ath/ath9k/main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index a4197c14f0a9..8311a45c5ea8 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -203,7 +203,7 @@ void ath_cancel_work(struct ath_softc *sc)
void ath_restart_work(struct ath_softc *sc)
{
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))
ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work,
@@ -2239,7 +2239,7 @@ void __ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop,
}
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)
--
2.40.1
Dmitry Antipov <[email protected]> writes:
> 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()'.
>
> Signed-off-by: Dmitry Antipov <[email protected]>
I believe this warrants a:
Fixes: d63ffc45c5d3 ("ath9k: rename tx_complete_work to hw_check_work")
with that:
Acked-by: Toke Høiland-Jørgensen <[email protected]>
Toke Høiland-Jørgensen <[email protected]> writes:
> Dmitry Antipov <[email protected]> writes:
>
>> 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()'.
>>
>> Signed-off-by: Dmitry Antipov <[email protected]>
>
> I believe this warrants a:
>
> Fixes: d63ffc45c5d3 ("ath9k: rename tx_complete_work to hw_check_work")
I can add that.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Kalle Valo <[email protected]> writes:
> Toke Høiland-Jørgensen <[email protected]> writes:
>
>> Dmitry Antipov <[email protected]> writes:
>>
>>> 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()'.
>>>
>>> Signed-off-by: Dmitry Antipov <[email protected]>
>>
>> I believe this warrants a:
>>
>> Fixes: d63ffc45c5d3 ("ath9k: rename tx_complete_work to hw_check_work")
>
> I can add that.
I was hoping you'd say that - thanks :)
-Toke
Toke Høiland-Jørgensen <[email protected]> writes:
> Kalle Valo <[email protected]> writes:
>
>> Toke Høiland-Jørgensen <[email protected]> writes:
>>
>>> Dmitry Antipov <[email protected]> writes:
>>>
>>>> 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()'.
>>>>
>>>> Signed-off-by: Dmitry Antipov <[email protected]>
>>>
>>> I believe this warrants a:
>>>
>>> Fixes: d63ffc45c5d3 ("ath9k: rename tx_complete_work to hw_check_work")
>>
>> I can add that.
>
> I was hoping you'd say that - thanks :)
BTW you can always assume that I can change or fix the commit messages.
Just let me know exactly what to change, being able to copy paste is
best :)
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Kalle Valo <[email protected]> writes:
> Toke Høiland-Jørgensen <[email protected]> writes:
>
>> Kalle Valo <[email protected]> writes:
>>
>>> Toke Høiland-Jørgensen <[email protected]> writes:
>>>
>>>> Dmitry Antipov <[email protected]> writes:
>>>>
>>>>> 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()'.
>>>>>
>>>>> Signed-off-by: Dmitry Antipov <[email protected]>
>>>>
>>>> I believe this warrants a:
>>>>
>>>> Fixes: d63ffc45c5d3 ("ath9k: rename tx_complete_work to hw_check_work")
>>>
>>> I can add that.
>>
>> I was hoping you'd say that - thanks :)
>
> BTW you can always assume that I can change or fix the commit messages.
> Just let me know exactly what to change, being able to copy paste is
> best :)
ACK :)
-Toke
Dmitry Antipov <[email protected]> wrote:
> 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: d63ffc45c5d3 ("ath9k: rename tx_complete_work to hw_check_work")
> Signed-off-by: Dmitry Antipov <[email protected]>
> Acked-by: Toke Høiland-Jørgensen <[email protected]>
> Signed-off-by: Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
2aa083acea9f wifi: ath9k: convert msecs to jiffies where needed
--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches