diff options
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r-- | net/mac80211/mlme.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 807ab89bdad9..76c03daeb455 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -1166,6 +1166,9 @@ static void ieee80211_mgd_probe_ap(struct ieee80211_sub_if_data *sdata, | |||
1166 | if (!netif_running(sdata->dev)) | 1166 | if (!netif_running(sdata->dev)) |
1167 | return; | 1167 | return; |
1168 | 1168 | ||
1169 | if (sdata->local->scanning) | ||
1170 | return; | ||
1171 | |||
1169 | mutex_lock(&ifmgd->mtx); | 1172 | mutex_lock(&ifmgd->mtx); |
1170 | 1173 | ||
1171 | if (!ifmgd->associated) | 1174 | if (!ifmgd->associated) |
@@ -2213,9 +2216,6 @@ static void ieee80211_sta_monitor_work(struct work_struct *work) | |||
2213 | container_of(work, struct ieee80211_sub_if_data, | 2216 | container_of(work, struct ieee80211_sub_if_data, |
2214 | u.mgd.monitor_work); | 2217 | u.mgd.monitor_work); |
2215 | 2218 | ||
2216 | if (sdata->local->scanning) | ||
2217 | return; | ||
2218 | |||
2219 | ieee80211_mgd_probe_ap(sdata, false); | 2219 | ieee80211_mgd_probe_ap(sdata, false); |
2220 | } | 2220 | } |
2221 | 2221 | ||