From owner-svn-src-user@FreeBSD.ORG  Sat Apr 25 05:52:48 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 64FDC106566B;
	Sat, 25 Apr 2009 05:52:48 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5414C8FC13;
	Sat, 25 Apr 2009 05:52:48 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3P5qmRs043711;
	Sat, 25 Apr 2009 05:52:48 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3P5qmAo043710;
	Sat, 25 Apr 2009 05:52:48 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200904250552.n3P5qmAo043710@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Sat, 25 Apr 2009 05:52:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191481 - user/thompsa/vaptq/sys/net80211
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Apr 2009 05:52:48 -0000

Author: thompsa
Date: Sat Apr 25 05:52:48 2009
New Revision: 191481
URL: http://svn.freebsd.org/changeset/base/191481

Log:
  - Remove the lock assert before cv_signal() as the pointer to the ic may be
    dead, as its a static function the callers can be verified.
  - Assert the scan has been stopped before freeing the memory.

Modified:
  user/thompsa/vaptq/sys/net80211/ieee80211_scan.c

Modified: user/thompsa/vaptq/sys/net80211/ieee80211_scan.c
==============================================================================
--- user/thompsa/vaptq/sys/net80211/ieee80211_scan.c	Sat Apr 25 05:45:08 2009	(r191480)
+++ user/thompsa/vaptq/sys/net80211/ieee80211_scan.c	Sat Apr 25 05:52:48 2009	(r191481)
@@ -131,6 +131,8 @@ ieee80211_scan_detach(struct ieee80211co
 		scan_signal(ss);
 		IEEE80211_UNLOCK(ic);
 		taskqueue_drain(ic->ic_tq, &SCAN_PRIVATE(ss)->ss_scan_task);
+		KASSERT((ic->ic_flags & IEEE80211_F_SCAN) == 0,
+		    ("scan still running"));
 		if (ss->ss_ops != NULL) {
 			ss->ss_ops->scan_detach(ss);
 			ss->ss_ops = NULL;
@@ -813,8 +815,6 @@ scan_signal(void *arg)
 {
 	struct ieee80211_scan_state *ss = (struct ieee80211_scan_state *) arg;
 
-	IEEE80211_LOCK_ASSERT(ss->ss_vap->iv_ic);
-
 	cv_signal(&SCAN_PRIVATE(ss)->ss_scan_cv);
 }