svn commit: r209575 - releng/8.1/sys/dev/ath/ath_hal/ar5416
Rui Paulo
rpaulo at FreeBSD.org
Mon Jun 28 14:15:55 UTC 2010
Author: rpaulo
Date: Mon Jun 28 14:15:54 2010
New Revision: 209575
URL: http://svn.freebsd.org/changeset/base/209575
Log:
MFC r209541, r209548:
Fix the AR_SREV_MERLIN_20_OR_LATER() check.
Approved by: re (kensmith)
Modified:
releng/8.1/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
Directory Properties:
releng/8.1/sys/ (props changed)
releng/8.1/sys/amd64/include/xen/ (props changed)
releng/8.1/sys/cddl/contrib/opensolaris/ (props changed)
releng/8.1/sys/contrib/dev/acpica/ (props changed)
releng/8.1/sys/contrib/pf/ (props changed)
releng/8.1/sys/dev/ixgbe/ (props changed)
releng/8.1/sys/dev/xen/xenpci/ (props changed)
releng/8.1/sys/geom/sched/ (props changed)
Modified: releng/8.1/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
==============================================================================
--- releng/8.1/sys/dev/ath/ath_hal/ar5416/ar5416reg.h Mon Jun 28 14:06:44 2010 (r209574)
+++ releng/8.1/sys/dev/ath/ath_hal/ar5416/ar5416reg.h Mon Jun 28 14:15:54 2010 (r209575)
@@ -612,7 +612,7 @@
AH_PRIVATE((_ah))->ah_macRev == AR_XSREV_REVISION_MERLIN_20)
#define AR_SREV_MERLIN_20_OR_LATER(_ah) \
(AR_SREV_MERLIN_20(_ah) || \
- AH_PRIVATE((_ah))->ah_macVersion > AR_XSREV_VERSION_MERLIN)
+ AH_PRIVATE((_ah))->ah_macVersion >= AR_XSREV_VERSION_MERLIN)
#define AR_SREV_KITE(_ah) \
(AH_PRIVATE((_ah))->ah_macVersion == AR_XSREV_VERSION_KITE)
More information about the svn-src-all
mailing list