summaryrefslogtreecommitdiffstats
path: root/sys/dev/bge/if_bgereg.h
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2008-05-14 21:00:27 +0000
committermarius <marius@FreeBSD.org>2008-05-14 21:00:27 +0000
commitaee2bbc2886f13a2df8f93770a615656c3929ff8 (patch)
treeba4c7e6ea043fbb720dac028ac0f9f60eb250136 /sys/dev/bge/if_bgereg.h
parent1869e07b5f35533995428936f524659abd6b60e3 (diff)
downloadFreeBSD-src-aee2bbc2886f13a2df8f93770a615656c3929ff8.zip
FreeBSD-src-aee2bbc2886f13a2df8f93770a615656c3929ff8.tar.gz
Improve the integration of BCM5906[M] support:
- Rename BGE_FLAG_EEPROM to BGE_FLAG_EADDR to underline it's absence means "there's no chip containing an Ethernet address fitted to the BGE chip so we have to get it from the firmware instead" rather than "there's no EEPROM, but maybe NVRAM or something else". - Don't treat BCM5906[M] generally like chips w/o BGE_FLAG_EADDR set, just in the two cases really necessary. This gets us line with the original patch for DragonFlyBSD. - For sparc64 restore the intended behavior of obtaining the Ethernet address from the firmware in case BGE_FLAG_EADDR is not set, even for BCM5906[M]. - Fix some style(9) bugs introduced with rev. 1.208 of if_bge.c Approved by: jhb Additional testing by: Thomas Nystroem (BCM5906)
Diffstat (limited to 'sys/dev/bge/if_bgereg.h')
-rw-r--r--sys/dev/bge/if_bgereg.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/bge/if_bgereg.h b/sys/dev/bge/if_bgereg.h
index 3a02ffd..4e1980c 100644
--- a/sys/dev/bge/if_bgereg.h
+++ b/sys/dev/bge/if_bgereg.h
@@ -2532,7 +2532,7 @@ struct bge_softc {
#define BGE_FLAG_TBI 0x00000001
#define BGE_FLAG_JUMBO 0x00000002
#define BGE_FLAG_WIRESPEED 0x00000004
-#define BGE_FLAG_EEPROM 0x00000008
+#define BGE_FLAG_EADDR 0x00000008
#define BGE_FLAG_MSI 0x00000100
#define BGE_FLAG_PCIX 0x00000200
#define BGE_FLAG_PCIE 0x00000400
@@ -2548,7 +2548,6 @@ struct bge_softc {
#define BGE_FLAG_BER_BUG 0x02000000
#define BGE_FLAG_ADJUST_TRIM 0x04000000
#define BGE_FLAG_CRC_BUG 0x08000000
-#define BGE_FLAG_NO_EEPROM 0x10000000
#define BGE_FLAG_5788 0x20000000
uint32_t bge_chipid;
uint8_t bge_asicrev;
OpenPOWER on IntegriCloud