Date: Tue, 8 Jan 2008 20:46:19 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 132810 for review Message-ID: <200801082046.m08KkJ5j013145@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=132810 Change 132810 by sam@sam_ebb on 2008/01/08 20:46:14 nuke netbsd-specific code before trying to do vap conversion Affected files ... .. //depot/projects/vap/sys/dev/wi/if_wi.c#10 edit Differences ... ==== //depot/projects/vap/sys/dev/wi/if_wi.c#10 (text+ko) ==== @@ -334,8 +334,6 @@ ic->ic_ifp = ifp; ic->ic_phytype = IEEE80211_T_DS; - ic->ic_opmode = IEEE80211_M_STA; - ic->ic_state = IEEE80211_S_INIT; ic->ic_caps = IEEE80211_C_PMGT | IEEE80211_C_WEP /* everyone supports WEP */ ; @@ -573,55 +571,7 @@ return (0); } -#ifdef __NetBSD__ -int -wi_activate(struct device *self, enum devact act) -{ - struct wi_softc *sc = (struct wi_softc *)self; - int rv = 0, s; - - s = splnet(); - switch (act) { - case DVACT_ACTIVATE: - rv = EOPNOTSUPP; - break; - - case DVACT_DEACTIVATE: - if_deactivate(sc->sc_ifp); - break; - } - splx(s); - return rv; -} - void -wi_power(struct wi_softc *sc, int why) -{ - struct ifnet *ifp = sc->sc_ifp; - int s; - - s = splnet(); - switch (why) { - case PWR_SUSPEND: - case PWR_STANDBY: - wi_stop(ifp, 1); - break; - case PWR_RESUME: - if (ifp->if_flags & IFF_UP) { - wi_init(sc); - (void)wi_intr(sc); - } - break; - case PWR_SOFTSUSPEND: - case PWR_SOFTSTANDBY: - case PWR_SOFTRESUME: - break; - } - splx(s); -} -#endif /* __NetBSD__ */ - -void wi_shutdown(device_t dev) { struct wi_softc *sc = device_get_softc(dev); @@ -892,13 +842,8 @@ if (sc->sc_enabled && !sc->wi_gone) { CSR_WRITE_2(sc, WI_INT_EN, 0); wi_cmd(sc, WI_CMD_DISABLE | sc->sc_portnum, 0, 0, 0); - if (disable) { -#ifdef __NetBSD__ - if (sc->sc_disable) - (*sc->sc_disable)(sc); -#endif + if (disable) sc->sc_enabled = 0; - } } else if (sc->wi_gone && disable) /* gone --> not enabled */ sc->sc_enabled = 0;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801082046.m08KkJ5j013145>