1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h b/drivers/net/wireless/bcm43xx/bcm43xx.h
index 0e790efae683..95ff175d8f33 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx.h
@@ -21,7 +21,7 @@
 #define PFX                             KBUILD_MODNAME ": "
 
 #define BCM43xx_SWITCH_CORE_MAX_RETRIES 50
-#define BCM43xx_IRQWAIT_MAX_RETRIES     50
+#define BCM43xx_IRQWAIT_MAX_RETRIES     100
 
 #define BCM43xx_IO_SIZE                 8192
 
@@ -333,7 +333,7 @@
 #define BCM43xx_SBF_PS2                 0x04000000
 #define BCM43xx_SBF_NO_SSID_BCAST       0x08000000
 #define BCM43xx_SBF_TIME_UPDATE         0x10000000
-#define BCM43xx_SBF_80000000            0x80000000 /*FIXME: fix name*/
+#define BCM43xx_SBF_MODE_G              0x80000000
 
 /* Microcode */
 #define BCM43xx_UCODE_REVISION          0x0000
@@ -507,8 +507,6 @@ struct bcm43xx_sprominfo {
         u8 et1macaddr[6];
         u8 et0phyaddr:5;
         u8 et1phyaddr:5;
-        u8 et0mdcport:1;
-        u8 et1mdcport:1;
         u8 boardrev;
         u8 locale:4;
         u8 antennas_aphy:2;
@@ -542,7 +540,7 @@ struct bcm43xx_lopair {
 
 struct bcm43xx_phyinfo {
         /* Hardware Data */
-        u8 version;
+        u8 analog;
         u8 type;
         u8 rev;
         u16 antenna_diversity;