---

yaml
---
r: 24731
b: refs/heads/master
c: b3db5e5
h: refs/heads/master
i:
  24729: 6ed7a59
  24727: 1af3ec3
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cf6f03e067d6d416f5c9219471daf64703afae4
+refs/heads/master: b3db5e553876c1743eefae5963aea431ec4d5ba6

trunk/drivers/net/wireless/bcm43xx/bcm43xx.h

@@ -120,6 +120,10 @@
 #define BCM43xx_BFL_AFTERBURNER		0x0200 /* supports Afterburner mode */
 #define BCM43xx_BFL_NOPCI		0x0400 /* leaves PCI floating */
 #define BCM43xx_BFL_FEM			0x0800 /* supports the Front End Module */
+#define BCM43xx_BFL_EXTLNA		0x1000 /* has an external LNA */
+#define BCM43xx_BFL_HGPA		0x2000 /* had high gain PA */
+#define BCM43xx_BFL_BTCMOD		0x4000 /* BFL_BTCOEXIST is given in alternate GPIOs */
+#define BCM43xx_BFL_ALTIQ		0x8000 /* alternate I/Q settings */
 
 /* GPIO register offset, in both ChipCommon and PCI core. */
 #define BCM43xx_GPIO_CONTROL		0x6c

trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c

@@ -910,6 +910,15 @@ static int bcm43xx_sprom_extract(struct bcm43xx_private *bcm)
 	if (value == 0xFFFF)
 		value = 0x0000;
 	bcm->sprom.boardflags = value;
+	/* boardflags workarounds */
+	if (bcm->board_vendor == PCI_VENDOR_ID_DELL &&
+	    bcm->chip_id == 0x4301 &&
+	    bcm->board_revision == 0x74)
+		bcm->sprom.boardflags |= BCM43xx_BFL_BTCOEXIST;
+	if (bcm->board_vendor == PCI_VENDOR_ID_APPLE &&
+	    bcm->board_type == 0x4E &&
+	    bcm->board_revision > 0x40)
+		bcm->sprom.boardflags |= BCM43xx_BFL_PACTRL;
 
 	/* antenna gain */
 	value = sprom[BCM43xx_SPROM_ANTENNA_GAIN];