diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2001-11-27 02:33:16 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2001-11-27 02:33:16 +0000 |
| commit | 2dd9975aaf2f4067867bb9e848c3d44fcdabcf8f (patch) | |
| tree | 3e42e19f10e7bf755be8a20fa71e95c40f8ec008 /sys | |
| parent | 25dce6b630b0f68ffcbbab79bea7f9ddff1d9738 (diff) | |
remove sc_enaddr and just put the ethernet address into arpcom.ac_enaddr.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/sbus/be.c | 13 | ||||
| -rw-r--r-- | sys/dev/sbus/qe.c | 13 |
2 files changed, 10 insertions, 16 deletions
diff --git a/sys/dev/sbus/be.c b/sys/dev/sbus/be.c index 3c0b62d6e23..38859b1d1b0 100644 --- a/sys/dev/sbus/be.c +++ b/sys/dev/sbus/be.c @@ -1,4 +1,4 @@ -/* $OpenBSD: be.c,v 1.3 2001/09/12 19:48:11 jason Exp $ */ +/* $OpenBSD: be.c,v 1.4 2001/11/27 02:33:15 jason Exp $ */ /* $NetBSD: be.c,v 1.26 2001/03/20 15:39:20 pk Exp $ */ /*- @@ -151,9 +151,6 @@ struct be_softc { int sc_burst; struct qec_ring sc_rb; /* Packet Ring Buffer */ - - /* MAC address */ - u_int8_t sc_enaddr[6]; }; int bematch __P((struct device *, void *, void *)); @@ -303,8 +300,8 @@ beattach(parent, self, aux) (void)bus_intr_establish(sa->sa_bustag, sa->sa_pri, IPL_NET, 0, beintr, sc); - myetheraddr(sc->sc_enaddr); - printf(" address %s\n", ether_sprintf(sc->sc_enaddr)); + myetheraddr(sc->sc_arpcom.ac_enaddr); + printf(" address %s\n", ether_sprintf(sc->sc_arpcom.ac_enaddr)); /* * Allocate descriptor ring and buffers. @@ -1005,7 +1002,7 @@ beioctl(ifp, cmd, data) *(union ns_host *)LLADDR(ifp->if_sadl); else bcopy(ina->x_host.c_host, LLADDR(ifp->if_sadl), - sizeof(sc->sc_enaddr)); + sizeof(sc->sc_arpcom.ac_enaddr)); /* Set new address. */ beinit(sc); break; @@ -1097,7 +1094,7 @@ beinit(sc) bestop(sc); - ea = sc->sc_enaddr; + ea = sc->sc_arpcom.ac_enaddr; bus_space_write_4(t, br, BE_BRI_MACADDR0, (ea[0] << 8) | ea[1]); bus_space_write_4(t, br, BE_BRI_MACADDR1, (ea[2] << 8) | ea[3]); bus_space_write_4(t, br, BE_BRI_MACADDR2, (ea[4] << 8) | ea[5]); diff --git a/sys/dev/sbus/qe.c b/sys/dev/sbus/qe.c index 4417107ac8c..6abecc4a46a 100644 --- a/sys/dev/sbus/qe.c +++ b/sys/dev/sbus/qe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qe.c,v 1.3 2001/09/12 19:48:11 jason Exp $ */ +/* $OpenBSD: qe.c,v 1.4 2001/11/27 02:33:15 jason Exp $ */ /* $NetBSD: qe.c,v 1.16 2001/03/30 17:30:18 christos Exp $ */ /*- @@ -143,9 +143,6 @@ struct qe_softc { struct qec_ring sc_rb; /* Packet Ring Buffer */ - /* MAC address */ - u_int8_t sc_enaddr[6]; - #ifdef QEDEBUG int sc_debug; #endif @@ -252,7 +249,7 @@ qeattach(parent, self, aux) /* Note: no interrupt level passed */ (void)bus_intr_establish(sa->sa_bustag, 0, IPL_NET, 0, qeintr, sc); - myetheraddr(sc->sc_enaddr); + myetheraddr(sc->sc_arpcom.ac_enaddr); /* * Allocate descriptor ring and buffers. @@ -330,7 +327,7 @@ qeattach(parent, self, aux) if_attach(ifp); ether_ifattach(ifp); - printf(" address %s\n", ether_sprintf(sc->sc_enaddr)); + printf(" address %s\n", ether_sprintf(sc->sc_arpcom.ac_enaddr)); } /* @@ -947,7 +944,7 @@ qeioctl(ifp, cmd, data) *(union ns_host *)LLADDR(ifp->if_sadl); else bcopy(ina->x_host.c_host, LLADDR(ifp->if_sadl), - sizeof(sc->sc_enaddr)); + sizeof(sc->sc_arpcom.ac_enaddr)); /* Set new address. */ qeinit(sc); break; @@ -1094,7 +1091,7 @@ qeinit(sc) /* * Station address */ - ea = sc->sc_enaddr; + ea = sc->sc_arpcom.ac_enaddr; bus_space_write_1(t, mr, QE_MRI_IAC, QE_MR_IAC_ADDRCHG | QE_MR_IAC_PHYADDR); bus_space_write_multi_1(t, mr, QE_MRI_PADR, ea, 6); |