1 files changed, 2 insertions, 3 deletions

diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c
index 69cb6aad25be..3bca97f55d47 100644
--- a/net/ieee80211/ieee80211_module.c
+++ b/net/ieee80211/ieee80211_module.c
@@ -181,9 +181,8 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
         ieee->ieee802_1x = 1;   /* Default to supporting 802.1x */
 
         INIT_LIST_HEAD(&ieee->crypt_deinit_list);
-        init_timer(&ieee->crypt_deinit_timer);
-        ieee->crypt_deinit_timer.data = (unsigned long)ieee;
-        ieee->crypt_deinit_timer.function = ieee80211_crypt_deinit_handler;
+        setup_timer(&ieee->crypt_deinit_timer, ieee80211_crypt_deinit_handler,
+                        (unsigned long)ieee);
         ieee->crypt_quiesced = 0;
 
         spin_lock_init(&ieee->lock);