diff --git a/[refs] b/[refs]
index 01c7210b7150..574115e2626f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ab56078e638efb75ac4ccd27c7196cdfed2e6c8
+refs/heads/master: a99d02483a40b9410d8a7af3b653ebc3f106280f
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index e3b3156aca9e..523c0d994d15 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -2213,6 +2213,9 @@ static void ieee80211_sta_monitor_work(struct work_struct *work)
 		container_of(work, struct ieee80211_sub_if_data,
 			     u.mgd.monitor_work);
 
+	if (sdata->local->sw_scanning || sdata->local->hw_scanning)
+		return;
+
 	ieee80211_mgd_probe_ap(sdata, false);
 }