---

yaml --- r: 24710 b: refs/heads/master c: 489423c h: refs/heads/master v: v3
git-mirror · Mar 27, 2006 · a040f97 · a040f97
1 parent 951f851
commit a040f97
Show file tree

Hide file tree

Showing 4 changed files with 128 additions and 182 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab4977f881fc23cb02ef6f20d1e8ebbdcfef75ad
+refs/heads/master: 489423c8d0ba2b4311530502f7b5a331da9a60f9
diff --git a/trunk/drivers/net/wireless/bcm43xx/bcm43xx.h b/trunk/drivers/net/wireless/bcm43xx/bcm43xx.h
@@ -19,16 +19,17 @@
 
 #define PFX				KBUILD_MODNAME ": "
 
-#define BCM43xx_SWITCH_CORE_MAX_RETRIES	10
+#define BCM43xx_SWITCH_CORE_MAX_RETRIES	50
 #define BCM43xx_IRQWAIT_MAX_RETRIES	50
 
 #define BCM43xx_IO_SIZE			8192
-#define BCM43xx_REG_ACTIVE_CORE		0x80
 
-/* Interrupt Control PCI Configuration Register. (Only on PCI cores with rev >= 6) */
-#define BCM43xx_PCICFG_ICR		0x94
+/* Active Core PCI Configuration Register. */
+#define BCM43xx_PCICFG_ACTIVE_CORE	0x80
 /* SPROM control register. */
 #define BCM43xx_PCICFG_SPROMCTL		0x88
+/* Interrupt Control PCI Configuration Register. (Only on PCI cores with rev >= 6) */
+#define BCM43xx_PCICFG_ICR		0x94
 
 /* MMIO offsets */
 #define BCM43xx_MMIO_DMA1_REASON	0x20