From 2fff38601f6d055d66ce187187e1c8c4b9864ea1 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 27 Jul 2010 16:33:08 -0400 Subject: [PATCH] --- yaml --- r: 203929 b: refs/heads/master c: a0daa0e7592ada797d6835f11529097aabc27ad2 h: refs/heads/master i: 203927: 2dfffc02359078672b12bf69a32ad7ff97b5914f v: v3 --- [refs] | 2 +- trunk/net/mac80211/scan.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 75253551b232..ba07774afbc0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 308883380c615b8b3d2c0eadb8680a921177c0b3 +refs/heads/master: a0daa0e7592ada797d6835f11529097aabc27ad2 diff --git a/trunk/net/mac80211/scan.c b/trunk/net/mac80211/scan.c index 439c98d93a79..41635b2c91bf 100644 --- a/trunk/net/mac80211/scan.c +++ b/trunk/net/mac80211/scan.c @@ -286,8 +286,6 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted) local->scanning = 0; local->scan_channel = NULL; - drv_sw_scan_complete(local); - /* we only have to protect scan_req and hw/sw scan */ mutex_unlock(&local->scan_mtx); @@ -297,6 +295,8 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted) ieee80211_configure_filter(local); + drv_sw_scan_complete(local); + ieee80211_offchannel_return(local, true); done: