Merge tag 'io_uring-6.2-2023-01-27' of git://git.kernel.dk/linux

[linux-block.git] / net / 802 / mrp.c

diff --git a/net/802/mrp.c b/net/802/mrp.c
index 66fcbf23b4868e95bafb3107bba98303912ffb7b..eafc21ecc287d9b49f724d474258a032da684e2f 100644 (file)
--- a/net/802/mrp.c
+++ b/net/802/mrp.c
@@ -911,8 +911,8 @@ void mrp_uninit_applicant(struct net_device *dev, struct mrp_application *appl)
        /* Delete timer and generate a final TX event to flush out
         * all pending messages before the applicant is gone.
         */
-       del_timer_sync(&app->join_timer);
-       del_timer_sync(&app->periodic_timer);
+       timer_shutdown_sync(&app->join_timer);
+       timer_shutdown_sync(&app->periodic_timer);
 
        spin_lock_bh(&app->lock);
        mrp_mad_event(app, MRP_EVENT_TX);