summaryrefslogtreecommitdiff
path: root/sys/dev/pcmcia
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2005-06-20 22:42:30 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2005-06-20 22:42:30 +0000
commite1f9ada7b9b7742f5a9971f81d306527771c6626 (patch)
treef4531a9c7a7e356cb8c659820083d207db2b7c8e /sys/dev/pcmcia
parent7df301d2051df22500fe1494c86ff82eaef679f7 (diff)
Replace arpcom in the softc with ieee80211com in preparation for
further net80211 changes. ok mickey@
Diffstat (limited to 'sys/dev/pcmcia')
-rw-r--r--sys/dev/pcmcia/if_an_pcmcia.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/dev/pcmcia/if_an_pcmcia.c b/sys/dev/pcmcia/if_an_pcmcia.c
index a295b5c26e2..e9104b7389b 100644
--- a/sys/dev/pcmcia/if_an_pcmcia.c
+++ b/sys/dev/pcmcia/if_an_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_an_pcmcia.c,v 1.13 2005/01/27 17:04:55 millert Exp $ */
+/* $OpenBSD: if_an_pcmcia.c,v 1.14 2005/06/20 22:42:29 jsg Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -40,6 +40,8 @@
#include <netinet/in.h>
#include <netinet/if_ether.h>
+#include <net80211/ieee80211_var.h>
+
#include <machine/bus.h>
#include <dev/pcmcia/pcmciareg.h>
@@ -143,7 +145,8 @@ an_pcmcia_detach(dev, flags)
{
struct an_pcmcia_softc *psc = (struct an_pcmcia_softc *)dev;
struct an_softc *sc = (struct an_softc *)dev;
- struct ifnet *ifp = &sc->sc_arpcom.ac_if;
+ struct ieee80211com *ic = &sc->sc_ic;
+ struct ifnet *ifp = &ic->ic_if;
if (sc->an_gone) {
printf ("%s: already detached\n", sc->sc_dev.dv_xname);
@@ -171,7 +174,8 @@ an_pcmcia_activate(dev, act)
{
struct an_pcmcia_softc *psc = (struct an_pcmcia_softc *)dev;
struct an_softc *sc = &psc->sc_an;
- struct ifnet *ifp = &sc->sc_arpcom.ac_if;
+ struct ieee80211com *ic = &sc->sc_ic;
+ struct ifnet *ifp = &ic->ic_if;
int s;
s = splnet();