netfilter: nft_set_pipapo: skip inactive elements during set walk

[platform/kernel/linux-starfive.git] / net / 802 / mrp.c

diff --git a/net/802/mrp.c b/net/802/mrp.c
index 66fcbf2..eafc21e 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);