PERFORCE change 108146 for review

[Robert Watson]

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

Change 108146 by rwatson at rwatson_zoo on 2006/10/20 01:08:49

	Integrate TrustedBSD priv6 branch.

Affected files ...

.. //depot/projects/trustedbsd/priv6/src/sys/dev/ath/if_athvar.h#4 integrate

Differences ...

==== //depot/projects/trustedbsd/priv6/src/sys/dev/ath/if_athvar.h#4 (text+ko) ====

@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.27.2.10 2006/10/16 01:01:41 sam Exp $
+ * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.27.2.11 2006/10/19 23:34:00 sam Exp $
  */
 
 /*
@@ -419,7 +419,7 @@
 	((*(_ah)->ah_getDiagState)((_ah), (_id), \
 		(_indata), (_insize), (_outdata), (_outsize)))
 #define	ath_hal_getfatalstate(_ah, _outdata, _outsize) \
-	ath_hal_getdiagstate(_ah, 27, NULL, 0, (void **)(_outdata), _outsize)
+	ath_hal_getdiagstate(_ah, 29, NULL, 0, (void **)(_outdata), _outsize)
 #define	ath_hal_setuptxqueue(_ah, _type, _irq) \
 	((*(_ah)->ah_setupTxQueue)((_ah), (_type), (_irq)))
 #define	ath_hal_resettxqueue(_ah, _q) \