diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-09-15 22:18:12 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-09-15 22:18:12 +0000 |
| commit | d5d1aa6f71cdfd10a18be9a2507e272e4935e1bc (patch) | |
| tree | dc00ee5f274e90445dc4b774d8e8041d0fc8b831 | |
| parent | 71fe4b8d3be9eafb84ac5f1e0da3e85dae9b2141 (diff) | |
make it at least compile; parts from maurice@amaze.nl
| -rw-r--r-- | sys/dev/ic/awi.c | 10 | ||||
| -rw-r--r-- | sys/dev/pcmcia/if_awi_pcmcia.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/ic/awi.c b/sys/dev/ic/awi.c index 1fa41d03b96..245b68677c1 100644 --- a/sys/dev/ic/awi.c +++ b/sys/dev/ic/awi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: awi.c,v 1.10 2002/03/14 01:26:54 millert Exp $ */ +/* $OpenBSD: awi.c,v 1.11 2002/09/15 22:18:11 deraadt Exp $ */ /* $NetBSD: awi.c,v 1.26 2000/07/21 04:48:55 onoe Exp $ */ /*- @@ -480,7 +480,7 @@ awi_ioctl(ifp, cmd, data) s = splnet(); #ifdef __OpenBSD__ - if ((error = ether_ioctl(ifp, &sc->sc_ec, cmd, data)) > 0) { + if ((error = ether_ioctl(ifp, &sc->sc_arpcom, cmd, data)) > 0) { splx(s); return (error); } @@ -521,8 +521,8 @@ awi_ioctl(ifp, cmd, data) error = ENETRESET; /*XXX*/ #else error = (cmd == SIOCADDMULTI) ? - ether_addmulti(ifr, &sc->sc_ec) : - ether_delmulti(ifr, &sc->sc_ec); + ether_addmulti(ifr, &sc->sc_arpcom) : + ether_delmulti(ifr, &sc->sc_arpcom); #endif /* * Do not rescan BSS. Rather, just reset multicast filter. @@ -822,7 +822,7 @@ awi_init(sc) n++; } #else - ETHER_FIRST_MULTI(step, &sc->sc_ec, enm); + ETHER_FIRST_MULTI(step, &sc->sc_arpcom, enm); while (enm != NULL) { if (n == AWI_GROUP_ADDR_SIZE || memcmp(enm->enm_addrlo, enm->enm_addrhi, ETHER_ADDR_LEN) diff --git a/sys/dev/pcmcia/if_awi_pcmcia.c b/sys/dev/pcmcia/if_awi_pcmcia.c index ed0c2ddcb71..ba576b3ffd3 100644 --- a/sys/dev/pcmcia/if_awi_pcmcia.c +++ b/sys/dev/pcmcia/if_awi_pcmcia.c @@ -1,5 +1,5 @@ /* $NetBSD: if_awi_pcmcia.c,v 1.13 2000/03/22 11:22:20 onoe Exp $ */ -/* $OpenBSD: if_awi_pcmcia.c,v 1.10 2002/03/14 01:27:00 millert Exp $ */ +/* $OpenBSD: if_awi_pcmcia.c,v 1.11 2002/09/15 22:18:11 deraadt Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -354,7 +354,7 @@ awi_pcmcia_attach(parent, self, aux) sc->sc_dev.dv_xname); goto no_interrupt; } - sc->sc_ifp = &sc->sc_ec.ac_if; + sc->sc_ifp = &sc->sc_arpcom.ac_if; sc->sc_cansleep = 1; if (awi_attach(sc) != 0) { |