svn commit: r221618 - head/sys/dev/ath/ath_hal/ar5416

Adrian Chadd adrian at FreeBSD.org
Sun May 8 05:45:07 UTC 2011


Author: adrian
Date: Sun May  8 05:45:06 2011
New Revision: 221618
URL: http://svn.freebsd.org/changeset/base/221618

Log:
  Properly indent the WAR code i pasted in from ath9k a few months
  ago.

Modified:
  head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c

Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c	Sun May  8 05:25:42 2011	(r221617)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c	Sun May  8 05:45:06 2011	(r221618)
@@ -2509,18 +2509,17 @@ ar5416OverrideIni(struct ath_hal *ah, co
 	 */
 	OS_REG_SET_BIT(ah, AR_DIAG_SW, (AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT));
 
-        if (AR_SREV_MERLIN_10_OR_LATER(ah)) {
-                val = OS_REG_READ(ah, AR_PCU_MISC_MODE2);
+	if (AR_SREV_MERLIN_10_OR_LATER(ah)) {
+		val = OS_REG_READ(ah, AR_PCU_MISC_MODE2);
 		val &= (~AR_PCU_MISC_MODE2_ADHOC_MCAST_KEYID_ENABLE);
+		if (!AR_SREV_9271(ah))
+			val &= ~AR_PCU_MISC_MODE2_HWWAR1;
 
-                if (!AR_SREV_9271(ah))
-                        val &= ~AR_PCU_MISC_MODE2_HWWAR1;
+		if (AR_SREV_9287_11_OR_LATER(ah))
+			val = val & (~AR_PCU_MISC_MODE2_HWWAR2);
 
-                if (AR_SREV_9287_11_OR_LATER(ah))
-                        val = val & (~AR_PCU_MISC_MODE2_HWWAR2);
-
-                OS_REG_WRITE(ah, AR_PCU_MISC_MODE2, val);
-        }
+		OS_REG_WRITE(ah, AR_PCU_MISC_MODE2, val);
+	}
 
 	/*
 	 * Disable RIFS search on some chips to avoid baseband


More information about the svn-src-all mailing list