From owner-p4-projects@FreeBSD.ORG  Wed Mar 19 17:08:56 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 74E101065672; Wed, 19 Mar 2008 17:08:56 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 33F7C106564A
	for <perforce@freebsd.org>; Wed, 19 Mar 2008 17:08:56 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2A4F38FC1B
	for <perforce@freebsd.org>; Wed, 19 Mar 2008 17:08:56 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2JH8uVM049021
	for <perforce@freebsd.org>; Wed, 19 Mar 2008 17:08:56 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2JH8udo049019
	for perforce@freebsd.org; Wed, 19 Mar 2008 17:08:56 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 19 Mar 2008 17:08:56 GMT
Message-Id: <200803191708.m2JH8udo049019@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 138110 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: Wed, 19 Mar 2008 17:08:57 -0000

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

Change 138110 by sam@sam_ebb on 2008/03/19 17:08:29

	(finally) add the hal status to the diagnostic generated after
	a failed ath_hal_reset call

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#47 edit

Differences ...

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

@@ -5328,9 +5328,10 @@
 		ath_stoprecv(sc);		/* turn off frame recv */
 		if (!ath_hal_reset(ah, sc->sc_opmode, &hchan, AH_TRUE, &status)) {
 			if_printf(ic->ic_ifp, "%s: unable to reset "
-			    "channel %u (%u Mhz, flags 0x%x hal flags 0x%x)\n",
-			    __func__, ieee80211_chan2ieee(ic, chan),
-			    chan->ic_freq, chan->ic_flags, hchan.channelFlags);
+			    "channel %u (%u Mhz, flags 0x%x hal flags 0x%x), "
+			    "hal status %u\n", __func__,
+			    ieee80211_chan2ieee(ic, chan), chan->ic_freq,
+			    chan->ic_flags, hchan.channelFlags, status);
 			return EIO;
 		}
 		sc->sc_curchan = hchan;