25c25
< __FBSDID("$FreeBSD: head/sys/dev/fe/if_fe_isa.c 142135 2005-02-20 19:33:13Z imp $");
---
> __FBSDID("$FreeBSD: head/sys/dev/fe/if_fe_isa.c 147256 2005-06-10 16:49:24Z brooks $");
254,255c254,255
< fe_inblk(sc, FE_FMV4, sc->sc_enaddr, ETHER_ADDR_LEN);
< if (!fe_valid_Ether_p(sc->sc_enaddr, 0x00000E))
---
> fe_inblk(sc, FE_FMV4, sc->enaddr, ETHER_ADDR_LEN);
> if (!fe_valid_Ether_p(sc->enaddr, 0x00000E))
389,390c389,390
< bcopy(eeprom + 8, sc->sc_enaddr, ETHER_ADDR_LEN);
< if (!fe_valid_Ether_p(sc->sc_enaddr, 0x0000F4))
---
> bcopy(eeprom + 8, sc->enaddr, ETHER_ADDR_LEN);
> if (!fe_valid_Ether_p(sc->enaddr, 0x0000F4))
518c518
< bcopy(eeprom+4, sc->sc_enaddr, ETHER_ADDR_LEN);
---
> bcopy(eeprom+4, sc->enaddr, ETHER_ADDR_LEN);
521c521
< bcopy(eeprom+122, sc->sc_enaddr, ETHER_ADDR_LEN);
---
> bcopy(eeprom+122, sc->enaddr, ETHER_ADDR_LEN);
616,621c616,621
< sc->sc_enaddr[0] = eeprom[3];
< sc->sc_enaddr[1] = eeprom[2];
< sc->sc_enaddr[2] = eeprom[5];
< sc->sc_enaddr[3] = eeprom[4];
< sc->sc_enaddr[4] = eeprom[7];
< sc->sc_enaddr[5] = eeprom[6];
---
> sc->enaddr[0] = eeprom[3];
> sc->enaddr[1] = eeprom[2];
> sc->enaddr[2] = eeprom[5];
> sc->enaddr[3] = eeprom[4];
> sc->enaddr[4] = eeprom[7];
> sc->enaddr[5] = eeprom[6];
624c624
< if (!fe_valid_Ether_p(sc->sc_enaddr, 0x00C0D0))
---
> if (!fe_valid_Ether_p(sc->enaddr, 0x00C0D0))
670c670
< bcopy(eeprom+n, sc->sc_enaddr, ETHER_ADDR_LEN);
---
> bcopy(eeprom+n, sc->enaddr, ETHER_ADDR_LEN);
844c844
< bcopy(eeprom + FE_SSI_EEP_ADDR, sc->sc_enaddr, ETHER_ADDR_LEN);
---
> bcopy(eeprom + FE_SSI_EEP_ADDR, sc->enaddr, ETHER_ADDR_LEN);
905c905
< bcopy(eeprom, sc->sc_enaddr, ETHER_ADDR_LEN);
---
> bcopy(eeprom, sc->enaddr, ETHER_ADDR_LEN);
965c965
< fe_inblk(sc, 0x18, sc->sc_enaddr, ETHER_ADDR_LEN);
---
> fe_inblk(sc, 0x18, sc->enaddr, ETHER_ADDR_LEN);
968c968
< if (!fe_valid_Ether_p(sc->sc_enaddr, 0x000061))
---
> if (!fe_valid_Ether_p(sc->enaddr, 0x000061))
1019,1020c1019,1020
< fe_inblk(sc, 0x18, sc->sc_enaddr, ETHER_ADDR_LEN);
< if (!fe_valid_Ether_p(sc->sc_enaddr, 0x00DD01))
---
> fe_inblk(sc, 0x18, sc->enaddr, ETHER_ADDR_LEN);
> if (!fe_valid_Ether_p(sc->enaddr, 0x00DD01))
1026c1026
< sum ^= sc->sc_enaddr[i];
---
> sum ^= sc->enaddr[i];