diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-20 11:28:42 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-20 11:28:42 -0500 |
| commit | 6606e17a7f1c3bc1b1e83d0c517f11d094e55bf1 (patch) | |
| tree | 83f20d0d3c12d9db75fdfc74454d781d2e4ea590 /drivers/net/wireless/bcm43xx/bcm43xx.h | |
| parent | 6aab44475a1355365f0a24abe6f8eb32185a701e (diff) | |
| parent | b312362be6d9155b66f3a26d9159e0a680fbd6c5 (diff) | |
| download | blackbird-op-linux-6606e17a7f1c3bc1b1e83d0c517f11d094e55bf1.tar.gz blackbird-op-linux-6606e17a7f1c3bc1b1e83d0c517f11d094e55bf1.zip | |
Merge branch 'upstream-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'drivers/net/wireless/bcm43xx/bcm43xx.h')
| -rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx.h | 8 |
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; |
