From owner-p4-projects@FreeBSD.ORG  Tue Jan 11 20:50:28 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0E26A16A4D0; Tue, 11 Jan 2005 20:50:28 +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 DC68C16A4CE
	for <perforce@freebsd.org>; Tue, 11 Jan 2005 20:50:27 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C992043D58
	for <perforce@freebsd.org>; Tue, 11 Jan 2005 20:50:27 +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 j0BKoRmZ008174
	for <perforce@freebsd.org>; Tue, 11 Jan 2005 20:50:27 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0BKoR1w008170
	for perforce@freebsd.org; Tue, 11 Jan 2005 20:50:27 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 11 Jan 2005 20:50:27 GMT
Message-Id: <200501112050.j0BKoR1w008170@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 68763 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, 11 Jan 2005 20:50:28 -0000

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

Change 68763 by sam@sam_ebb on 2005/01/11 20:49:32

	when transitioning to INIT state disable interrupts so we
	don't receive frames; any pending xmits should go out and
	the descriptors will be reaped anyway when we drain the queues

Affected files ...

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

Differences ...

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

@@ -4281,7 +4281,10 @@
 
 	if (nstate == IEEE80211_S_INIT) {
 		sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS);
-		ath_hal_intrset(ah, sc->sc_imask);
+		/*
+		 * NB: disable interrupts so we don't rx frames.
+		 */
+		ath_hal_intrset(ah, sc->sc_imask &~ ~HAL_INT_GLOBAL);
 		/*
 		 * Notify the rate control algorithm.
 		 */