]> git.itanic.dy.fi Git - linux-stable/commitdiff
wireguard: timers: move to using timer_delete_sync
authorJason A. Donenfeld <Jason@zx2c4.com>
Mon, 3 Jul 2023 01:27:06 +0000 (03:27 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 3 Jul 2023 08:17:52 +0000 (09:17 +0100)
The documentation says that del_timer_sync is obsolete, and code should
use the equivalent timer_delete_sync instead, so switch to it.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wireguard/timers.c

index 53d8a57a0dfa391b386e3ef2ca4ca3b0cf13d7f7..968bdb4df0b300d12abf6fe4e1858225b3caf044 100644 (file)
@@ -234,10 +234,10 @@ void wg_timers_init(struct wg_peer *peer)
 
 void wg_timers_stop(struct wg_peer *peer)
 {
-       del_timer_sync(&peer->timer_retransmit_handshake);
-       del_timer_sync(&peer->timer_send_keepalive);
-       del_timer_sync(&peer->timer_new_handshake);
-       del_timer_sync(&peer->timer_zero_key_material);
-       del_timer_sync(&peer->timer_persistent_keepalive);
+       timer_delete_sync(&peer->timer_retransmit_handshake);
+       timer_delete_sync(&peer->timer_send_keepalive);
+       timer_delete_sync(&peer->timer_new_handshake);
+       timer_delete_sync(&peer->timer_zero_key_material);
+       timer_delete_sync(&peer->timer_persistent_keepalive);
        flush_work(&peer->clear_peer_work);
 }