1 files changed, 1 insertions, 8 deletions

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 5940e69fa33..d134bd79972 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -277,11 +277,6 @@ static int ieee80211_open(struct net_device *dev)
                 }
         }
 
-        if (local->open_count == 0) {
-                tasklet_enable(&local->tx_pending_tasklet);
-                tasklet_enable(&local->tasklet);
-        }
-
         /*
          * set_multicast_list will be invoked by the networking core
          * which will check whether any increments here were done in
@@ -552,11 +547,9 @@ static int ieee80211_stop(struct net_device *dev)
         ieee80211_recalc_ps(local, -1);
 
         if (local->open_count == 0) {
+                ieee80211_clear_tx_pending(local);
                 ieee80211_stop_device(local);
 
-                tasklet_disable(&local->tx_pending_tasklet);
-                tasklet_disable(&local->tasklet);
-
                 /* no reconfiguring after stop! */
                 hw_reconf_flags = 0;
         }