summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2026-05-13 10:43:54 +0200
committerSven Eckelmann <sven@narfation.org>2026-05-15 10:41:55 +0200
commitd5487249a81ea658717614009c8f46acc5b7101a (patch)
tree47307361eafa5c438560635674a1da12c551571e /include/net
parentbc62216dc8e221e3781afa14430f45208bfa9af9 (diff)
batman-adv: tp_meter: directly shut down timer on cleanup
batadv_tp_sender_cleanup() was calling timer_delete_sync() followed by timer_delete() to guard against the timer handler re-arming itself between the two calls. This double-deletion hack relied on the sending status being set to 0 to suppress re-arming. Replace both calls with a single timer_shutdown_sync(). This function both waits for any running timer callback to complete (like timer_delete_sync()) and permanently disarms the timer so it cannot be re-armed afterwards, making re-arming prevention unconditional and self-documenting. The re-arming property is also required because otherwise: 1. context 0 (batadv_tp_recv_ack()) checks in batadv_tp_reset_sender_timer() if sending is still 1 -> it is 2. context 1 changes in batadv_tp_sender_shutdown() sending to 0 and in this process forces the kthread to stop timer in batadv_tp_sender_cleanup() 3. context 0 continues in batadv_tp_reset_sender_timer() and rearms the timer -> but the reference for it is already gone Cc: stable@kernel.org Fixes: 33a3bb4a3345 ("batman-adv: throughput meter implementation") Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'include/net')
0 files changed, 0 insertions, 0 deletions