diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2001-02-17 07:52:45 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2001-02-17 07:52:45 +0000 |
| commit | 0e50516f18587f40a1d0332ba0174031367ec8f0 (patch) | |
| tree | 0d360d1eae7ded98b0383566a67e1fff2dcee5ef | |
| parent | 0f4bc703c348f5de5a0716845f336d1551f706f7 (diff) | |
no need for seperate variable to hold ethernet address... that's what
ac_enaddr is for
| -rw-r--r-- | sys/dev/pci/if_rl.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_vr.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sys/dev/pci/if_rl.c b/sys/dev/pci/if_rl.c index 8f0cc8e9f37..58965a0a296 100644 --- a/sys/dev/pci/if_rl.c +++ b/sys/dev/pci/if_rl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rl.c,v 1.23 2001/02/03 05:46:17 mickey Exp $ */ +/* $OpenBSD: if_rl.c,v 1.24 2001/02/17 07:52:44 jason Exp $ */ /* * Copyright (c) 1997, 1998 @@ -1259,7 +1259,6 @@ rl_attach(parent, self, aux) pci_chipset_tag_t pc = pa->pa_pc; pci_intr_handle_t ih; const char *intrstr = NULL; - u_int8_t enaddr[ETHER_ADDR_LEN]; struct ifnet *ifp = &sc->arpcom.ac_if; bus_addr_t iobase; bus_size_t iosize; @@ -1329,8 +1328,7 @@ rl_attach(parent, self, aux) rl_reset(sc); - rl_read_eeprom(sc, (caddr_t)&enaddr, RL_EE_EADDR, 3, 0); - bcopy(enaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); + rl_read_eeprom(sc, (caddr_t)sc->arpcom.ac_enaddr, RL_EE_EADDR, 3, 0); printf(" address %s\n", ether_sprintf(sc->arpcom.ac_enaddr)); rl_read_eeprom(sc, (caddr_t)&rl_did, RL_EE_PCI_DID, 1, 0); diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index 38265475b2b..7d5da9dfda0 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vr.c,v 1.10 2001/02/17 07:35:36 jason Exp $ */ +/* $OpenBSD: if_vr.c,v 1.11 2001/02/17 07:52:44 jason Exp $ */ /* * Copyright (c) 1997, 1998 @@ -890,7 +890,6 @@ vr_attach(parent, self, aux) void *aux; { int s, i; - u_char eaddr[ETHER_ADDR_LEN]; u_int32_t command; struct vr_softc *sc = (struct vr_softc *)self; struct pci_attach_args *pa = aux; @@ -1008,12 +1007,11 @@ vr_attach(parent, self, aux) VR_SETBIT(sc, VR_EECSR, VR_EECSR_LOAD); DELAY(1000); for (i = 0; i < ETHER_ADDR_LEN; i++) - eaddr[i] = CSR_READ_1(sc, VR_PAR0 + i); + sc->arpcom.ac_enaddr[i] = CSR_READ_1(sc, VR_PAR0 + i); /* * A Rhine chip was detected. Inform the world. */ - bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); printf(" address %s\n", ether_sprintf(sc->arpcom.ac_enaddr)); sc->vr_ldata_ptr = malloc(sizeof(struct vr_list_data) + 8, |