Merge tag 'acpi-6.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-block.git] / net / 802 / garp.c

diff --git a/net/802/garp.c b/net/802/garp.c
index 77aac27638353c37e251b8d9931cc83cc4a575d5..ab24b21fbb493837bda01f4f22386d0f33ca1d48 100644 (file)
--- a/net/802/garp.c
+++ b/net/802/garp.c
@@ -618,7 +618,7 @@ void garp_uninit_applicant(struct net_device *dev, struct garp_application *appl
 
        /* Delete timer and generate a final TRANSMIT_PDU event to flush out
         * all pending messages before the applicant is gone. */
-       del_timer_sync(&app->join_timer);
+       timer_shutdown_sync(&app->join_timer);
 
        spin_lock_bh(&app->lock);
        garp_gid_event(app, GARP_EVENT_TRANSMIT_PDU);