From owner-p4-projects@FreeBSD.ORG  Tue Nov 23 03:46:43 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E75B716A4D0; Tue, 23 Nov 2004 03:46:42 +0000 (GMT)
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 A993516A4CE
	for <perforce@freebsd.org>; Tue, 23 Nov 2004 03:46:42 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9437E43D49
	for <perforce@freebsd.org>; Tue, 23 Nov 2004 03:46:42 +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 iAN3kgq0002165
	for <perforce@freebsd.org>; Tue, 23 Nov 2004 03:46:42 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAN3kgFA002162
	for perforce@freebsd.org; Tue, 23 Nov 2004 03:46:42 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 23 Nov 2004 03:46:42 GMT
Message-Id: <200411230346.iAN3kgFA002162@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>
Subject: PERFORCE change 65683 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Tue, 23 Nov 2004 03:46:43 -0000

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

Change 65683 by sam@sam_ebb on 2004/11/23 03:46:00

	check for ic_bss being null when handling ioctl to set
	promiscuous mode; this corrects a race that ocurrs when
	the bridge is loaded as a module

Affected files ...

.. //depot/projects/wifi/sys/dev/ath/if_ath.c#26 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ath/if_ath.c#26 (text+ko) ====

@@ -4010,15 +4010,15 @@
 			ath_mode_init(sc);
 		} else if (ifp->if_flags & IFF_UP) {
 			/*
-			 * Beware of being called during detach to
-			 * reset promiscuous mode.  In that case we
+			 * Beware of being called during attach/detach
+			 * to reset promiscuous mode.  In that case we
 			 * will still be marked UP but not RUNNING.
 			 * However trying to re-init the interface
 			 * is the wrong thing to do as we've already
 			 * torn down much of our state.  There's
 			 * probably a better way to deal with this.
 			 */
-			if (!sc->sc_invalid)
+			if (!sc->sc_invalid && ic->ic_bss != NULL)
 				ath_init(ifp);	/* XXX lose error */
 		} else
 			ath_stop_locked(ifp);