From patchwork Tue Jul 27 20:33:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Rodriguez X-Patchwork-Id: 114610 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6RKXHYH020804 for ; Tue, 27 Jul 2010 20:33:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752624Ab0G0UdP (ORCPT ); Tue, 27 Jul 2010 16:33:15 -0400 Received: from bombadil.infradead.org ([18.85.46.34]:55549 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752436Ab0G0UdM (ORCPT ); Tue, 27 Jul 2010 16:33:12 -0400 Received: from mcgrof by bombadil.infradead.org with local (Exim 4.72 #1 (Red Hat Linux)) id 1Odqpo-0002a5-Lr; Tue, 27 Jul 2010 20:33:08 +0000 From: "Luis R. Rodriguez" To: linville@tuxdriver.com, johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, "Luis R. Rodriguez" , Johannes Berg Subject: [PATCH 3/3] Revert "mac80211: fix sw scan bracketing" Date: Tue, 27 Jul 2010 16:33:08 -0400 Message-Id: <1280262788-9890-4-git-send-email-lrodriguez@atheros.com> X-Mailer: git-send-email 1.6.2.rc1.3.g81d3f In-Reply-To: <1280262788-9890-1-git-send-email-lrodriguez@atheros.com> References: <1280262788-9890-1-git-send-email-lrodriguez@atheros.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 27 Jul 2010 20:33:17 +0000 (UTC) diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index 4dcbf8b..9aa19ec 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -287,8 +287,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); @@ -298,6 +296,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: