1 files changed, 1 insertions, 9 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 779ac613ee57..d81c178c7712 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -625,8 +625,6 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
 
         INIT_DELAYED_WORK(&local->scan_work, ieee80211_scan_work);
 
-        ieee80211_work_init(local);
-
         INIT_WORK(&local->restart_work, ieee80211_restart_work);
 
         INIT_WORK(&local->reconfig_filter, ieee80211_reconfig_filter);
@@ -669,7 +667,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
 
         ieee80211_led_names(local);
 
-        ieee80211_hw_roc_setup(local);
+        ieee80211_roc_setup(local);
 
         return &local->hw;
 }
@@ -1016,12 +1014,6 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw)
 
         rtnl_unlock();
 
-        /*
-         * Now all work items will be gone, but the
-         * timer might still be armed, so delete it
-         */
-        del_timer_sync(&local->work_timer);
-
         cancel_work_sync(&local->restart_work);
         cancel_work_sync(&local->reconfig_filter);