diff options
author | Jonathan Gray <jsg@cvs.openbsd.org> | 2005-10-31 05:37:14 +0000 |
---|---|---|
committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2005-10-31 05:37:14 +0000 |
commit | a2d379a412d70d7f18266b90eecf61bf75aed786 (patch) | |
tree | 84985c08244149b919e5764f45df064882d6dd64 /sys/dev/pcmcia | |
parent | c06fa02432169ca616ff550b4d24d80656030da6 (diff) |
Move from arpcom to ieee80211com in wi softc. This will be
required for net80211 support.
Updated version of a diff from dlg@
similiar diff ok fgsch@, ok dlg@
Diffstat (limited to 'sys/dev/pcmcia')
-rw-r--r-- | sys/dev/pcmcia/if_wi_pcmcia.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c index 281154b0dd7..5355ea86bda 100644 --- a/sys/dev/pcmcia/if_wi_pcmcia.c +++ b/sys/dev/pcmcia/if_wi_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_pcmcia.c,v 1.63 2005/09/18 09:24:04 jsg Exp $ */ +/* $OpenBSD: if_wi_pcmcia.c,v 1.64 2005/10/31 05:37:13 jsg Exp $ */ /* $NetBSD: if_wi_pcmcia.c,v 1.14 2001/11/26 04:34:56 ichiro Exp $ */ /* @@ -48,6 +48,7 @@ #include <sys/timeout.h> #include <sys/socket.h> #include <sys/device.h> +#include <sys/tree.h> #include <net/if.h> #include <net/if_dl.h> @@ -60,6 +61,7 @@ #include <net80211/ieee80211.h> #include <net80211/ieee80211_ioctl.h> +#include <net80211/ieee80211_var.h> #include <machine/bus.h> @@ -446,7 +448,7 @@ wi_pcmcia_detach(struct device *dev, int flags) { struct wi_pcmcia_softc *psc = (struct wi_pcmcia_softc *)dev; struct wi_softc *sc = &psc->sc_wi; - struct ifnet *ifp = &sc->sc_arpcom.ac_if; + struct ifnet *ifp = &sc->sc_ic.ic_if; if (!(sc->wi_flags & WI_FLAGS_ATTACHED)) return (0); @@ -469,7 +471,7 @@ wi_pcmcia_activate(struct device *dev, enum devact act) { struct wi_pcmcia_softc *psc = (struct wi_pcmcia_softc *)dev; struct wi_softc *sc = &psc->sc_wi; - struct ifnet *ifp = &sc->sc_arpcom.ac_if; + struct ifnet *ifp = &sc->sc_ic.ic_if; int s; s = splnet(); |