1 files changed, 2 insertions, 0 deletions

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 8e0e3303ca8c..5d5a029228be 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -443,6 +443,7 @@ static int ieee80211_stop(struct net_device *dev)
                                                 WLAN_REASON_DEAUTH_LEAVING);
 
                 memset(sdata->u.sta.bssid, 0, ETH_ALEN);
+                del_timer_sync(&sdata->u.sta.chswitch_timer);
                 del_timer_sync(&sdata->u.sta.timer);
                 /*
                  * If the timer fired while we waited for it, it will have
@@ -452,6 +453,7 @@ static int ieee80211_stop(struct net_device *dev)
                  * it no longer is.
                  */
                 cancel_work_sync(&sdata->u.sta.work);
+                cancel_work_sync(&sdata->u.sta.chswitch_work);
                 /*
                  * When we get here, the interface is marked down.
                  * Call synchronize_rcu() to wait for the RX path