aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/iface.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r--net/mac80211/iface.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 0cb29df09e35..d79a21105042 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -518,7 +518,7 @@ static int ieee80211_stop(struct net_device *dev)
518 * the scan_sdata is NULL already don't send out a 518 * the scan_sdata is NULL already don't send out a
519 * scan event to userspace -- the scan is incomplete. 519 * scan event to userspace -- the scan is incomplete.
520 */ 520 */
521 if (local->sw_scanning) 521 if (test_bit(SCAN_SW_SCANNING, &local->scanning))
522 ieee80211_scan_completed(&local->hw, true); 522 ieee80211_scan_completed(&local->hw, true);
523 } 523 }
524 524
@@ -920,7 +920,7 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
920 struct ieee80211_sub_if_data *sdata; 920 struct ieee80211_sub_if_data *sdata;
921 int count = 0; 921 int count = 0;
922 922
923 if (local->hw_scanning || local->sw_scanning) 923 if (local->scanning)
924 return ieee80211_idle_off(local, "scanning"); 924 return ieee80211_idle_off(local, "scanning");
925 925
926 list_for_each_entry(sdata, &local->interfaces, list) { 926 list_for_each_entry(sdata, &local->interfaces, list) {