From owner-p4-projects@FreeBSD.ORG  Fri Jul 22 00:34:32 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 498F216A440; Fri, 22 Jul 2005 00:34:32 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0C5D216A425
	for <perforce@freebsd.org>; Fri, 22 Jul 2005 00:34:32 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9B2AC43D75
	for <perforce@freebsd.org>; Fri, 22 Jul 2005 00:34:28 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6M0YScW034019
	for <perforce@freebsd.org>; Fri, 22 Jul 2005 00:34:28 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6M0YSJE034016
	for perforce@freebsd.org; Fri, 22 Jul 2005 00:34:28 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 22 Jul 2005 00:34:28 GMT
Message-Id: <200507220034.j6M0YSJE034016@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 80725 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Jul 2005 00:34:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=80725

Change 80725 by sam@sam_ebb on 2005/07/22 00:34:20

	don't try to use the scanner state from a previous mode
	when doing a check_scan; fixes assert failure when starting
	in sta mode then switching to ap mode

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_scan.c#2 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_scan.c#2 (text+ko) ====

@@ -451,7 +451,17 @@
 	}
 	IEEE80211_UNLOCK(ic);
 	if (checkscanlist) {
-		if (ss->ss_ops->scan_end(ss, ic)) {
+		const struct ieee80211_scanner *scan;
+
+		scan = ieee80211_scanner_get(ic->ic_opmode);
+		if (scan == NULL) {
+			IEEE80211_DPRINTF(ic, IEEE80211_MSG_SCAN,
+			    "%s: no scanner support for mode %u\n",
+			    __func__, ic->ic_opmode);
+			/* XXX stat */
+			return 0;
+		}
+		if (scan == ss->ss_ops && ss->ss_ops->scan_end(ss, ic)) {
 			/* found an ap, just clear the flag */
 			ic->ic_flags &= ~IEEE80211_F_SCAN;
 			return 1;