---

yaml
---
r: 159099
b: refs/heads/master
c: 0e2b628
h: refs/heads/master
i:
  159097: d3f5b55
  159095: da5abce
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec96cfd8215af1cda016837efb266409164e3a30
+refs/heads/master: 0e2b6286805c419d28a4c1e19e3a121af7449b20

trunk/net/mac80211/iface.c

@@ -449,16 +449,18 @@ static int ieee80211_stop(struct net_device *dev)
 	case NL80211_IFTYPE_STATION:
 		del_timer_sync(&sdata->u.mgd.chswitch_timer);
 		del_timer_sync(&sdata->u.mgd.timer);
+		del_timer_sync(&sdata->u.mgd.conn_mon_timer);
+		del_timer_sync(&sdata->u.mgd.bcn_mon_timer);
 		/*
-		 * If the timer fired while we waited for it, it will have
-		 * requeued the work. Now the work will be running again
+		 * If any of the timers fired while we waited for it, it will
+		 * have queued its work. Now the work will be running again
 		 * but will not rearm the timer again because it checks
 		 * whether the interface is running, which, at this point,
 		 * it no longer is.
 		 */
 		cancel_work_sync(&sdata->u.mgd.work);
 		cancel_work_sync(&sdata->u.mgd.chswitch_work);
-
+		cancel_work_sync(&sdata->u.mgd.monitor_work);
 		cancel_work_sync(&sdata->u.mgd.beacon_loss_work);
 
 		/*

trunk/net/mac80211/mlme.c

@@ -1163,6 +1163,9 @@ static void ieee80211_mgd_probe_ap(struct ieee80211_sub_if_data *sdata,
 	const u8 *ssid;
 	bool already = false;
 
+	if (!netif_running(sdata->dev))
+		return;
+
 	mutex_lock(&ifmgd->mtx);
 
 	if (!ifmgd->associated)