diff options
| author | marius <marius@FreeBSD.org> | 2006-06-05 15:14:14 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2006-06-05 15:14:14 +0000 |
| commit | 37782e994eb8d462714f1803ec4b406cb3d9330d (patch) | |
| tree | 69e1164dcc089d37bda5f61bcb8450a8460b8588 /sys | |
| parent | 4de8a3e010f2074c16628b44962dffb43e78e92d (diff) | |
| download | FreeBSD-src-37782e994eb8d462714f1803ec4b406cb3d9330d.zip FreeBSD-src-37782e994eb8d462714f1803ec4b406cb3d9330d.tar.gz | |
Revert the part of rev. 1.3 which changed the software style to be
set to ILACC rather than PCnet-PCI as VMware doesn't implement ILACC
compatibility, resulting in the VMware virtual machine to crash if
enabled. Add a comment regarding usage of ILACC vs. PCnet-PCI mode.
Reported and tested by: gnn, wsalamon
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/le/if_le_pci.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sys/dev/le/if_le_pci.c b/sys/dev/le/if_le_pci.c index 89f8c0a..1a3f162 100644 --- a/sys/dev/le/if_le_pci.c +++ b/sys/dev/le/if_le_pci.c @@ -263,8 +263,16 @@ static void le_pci_hwreset(struct lance_softc *sc) { - /* Chip is stopped. Set software style to ILACC (32-bit). */ - le_pci_wrbcr(sc, LE_BCR20, LE_B20_SSTYLE_ILACC); + /* + * Chip is stopped. Set software style to PCnet-PCI (32-bit). + * Actually, am79900.c implements ILACC support (hence its + * name) but unfortunately VMware does not. As far as this + * driver is concerned that should not make a difference + * though, as the settings used have the same meaning for + * both, ILACC and PCnet-PCI (note that there would be a + * difference for the ADD_FCS/NO_FCS bit if used). + */ + le_pci_wrbcr(sc, LE_BCR20, LE_B20_SSTYLE_PCNETPCI2); } static void |
