From owner-p4-projects@FreeBSD.ORG  Thu Dec 30 17:31:32 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 71B3416A4D0; Thu, 30 Dec 2004 17:31:32 +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 336CB16A4CE
	for <perforce@freebsd.org>; Thu, 30 Dec 2004 17:31:32 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1F77D43D46
	for <perforce@freebsd.org>; Thu, 30 Dec 2004 17:31:32 +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 iBUHVWwv030145
	for <perforce@freebsd.org>; Thu, 30 Dec 2004 17:31:32 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBUHVVNP030142
	for perforce@freebsd.org; Thu, 30 Dec 2004 17:31:31 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 30 Dec 2004 17:31:31 GMT
Message-Id: <200412301731.iBUHVVNP030142@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 67907 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: Thu, 30 Dec 2004 17:31:33 -0000

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

Change 67907 by sam@sam_ebb on 2004/12/30 17:31:04

	o slight simplification to previous change
	o correct some comments and and #undef

Affected files ...

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

Differences ...

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

@@ -2763,7 +2763,7 @@
 	if (qnum == -1) {
 		/*
 		 * NB: don't print a message, this happens 
-		 * ormally on parts with too few tx queues
+		 * normally on parts with too few tx queues
 		 */
 		return NULL;
 	}
@@ -3685,7 +3685,7 @@
 		ath_setcurmode(sc, mode);
 	/*
 	 * Update BPF state.  NB: ethereal et. al. don't handle
-	 * merged flags well, so pick a mode for their use.
+	 * merged flags well so pick a unique mode for their use.
 	 */
 	if (IEEE80211_IS_CHAN_A(chan))
 		flags = IEEE80211_CHAN_A;
@@ -3693,10 +3693,8 @@
 	else if (IEEE80211_IS_CHAN_G(chan) ||
 	    IEEE80211_IS_CHAN_PUREG(chan))
 		flags = IEEE80211_CHAN_G;
-	else if (IEEE80211_IS_CHAN_B(chan))
+	else
 		flags = IEEE80211_CHAN_B;
-	else
-		flags = 0;
 	if (IEEE80211_IS_CHAN_T(chan))
 		flags |= IEEE80211_CHAN_TURBO;
 	sc->sc_tx_th.wt_chan_freq = sc->sc_rx_th.wr_chan_freq =
@@ -4318,7 +4316,7 @@
 	}
 	ATH_UNLOCK(sc);
 	return error;
-#undef IS_UP
+#undef IS_RUNNING
 }
 
 static int