Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove shutdown hooks. Use KASSERT().

This commit is contained in:
dyoung 2007-12-20 18:47:23 +00:00
parent f2a1e06d0a
commit 241d11997f
2 changed files with 5 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
sys/dev/ic/rtw.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rtw.c,v 1.96 2007/12/16 21:39:33 dyoung Exp $ */
/* $NetBSD: rtw.c,v 1.97 2007/12/20 18:47:23 dyoung Exp $ */
/*-
* Copyright (c) 2004, 2005, 2006, 2007 David Young. All rights
* reserved.
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.96 2007/12/16 21:39:33 dyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.97 2007/12/20 18:47:23 dyoung Exp $");
#include "bpfilter.h"
@ -1135,10 +1135,7 @@ rtw_chan2txpower(struct rtw_srom *sr, struct ieee80211com *ic,
struct ieee80211_channel *chan)
{
u_int idx = RTW_SR_TXPOWER1 + ieee80211_chan2ieee(ic, chan) - 1;
if (idx < RTW_SR_TXPOWER1 || idx > RTW_SR_TXPOWER14) {
panic("%s: channel %d out of range", __func__,
idx - RTW_SR_TXPOWER1 + 1);
}
KASSERT(idx >= RTW_SR_TXPOWER1 && idx <= RTW_SR_TXPOWER14);
return RTW_SR_GET(sr, idx);
}
@ -2420,8 +2417,7 @@ rtw_tune(struct rtw_softc *sc)
dflantb = sc->sc_flags & RTW_F_DFLANTB;
chan = ieee80211_chan2ieee(ic, ic->ic_curchan);
if (chan == IEEE80211_CHAN_ANY)
panic("%s: chan == IEEE80211_CHAN_ANY\n", __func__);
KASSERT(chan != IEEE80211_CHAN_ANY);
rt->rt_chan_freq = htole16(ic->ic_curchan->ic_freq);
rt->rt_chan_flags = htole16(ic->ic_curchan->ic_flags);
@ -3692,15 +3688,6 @@ rtw_media_status(struct ifnet *ifp, struct ifmediareq *imr)
ieee80211_media_status(ifp, imr);
}
/* rtw_shutdown: make sure the interface is stopped at reboot time. */
void
rtw_shutdown(void *arg)
{
struct rtw_softc *sc = arg;
rtw_stop(&sc->sc_if, 1);
}
static inline void
rtw_setifprops(struct ifnet *ifp, const char *dvname, void *softc)
{
@ -3755,27 +3742,6 @@ rtw_set80211methods(struct rtw_mtbl *mtbl, struct ieee80211com *ic)
ic->ic_crypto.cs_key_update_end = rtw_key_update_end;
}
static inline void
rtw_establish_hooks(struct rtw_hooks *hooks, const char *dvname,
void *arg)
{
/*
* Make sure the interface is shutdown during reboot.
*/
hooks->rh_shutdown = shutdownhook_establish(rtw_shutdown, arg);
if (hooks->rh_shutdown == NULL)
printf("%s: WARNING: unable to establish shutdown hook\n",
dvname);
}
static inline void
rtw_disestablish_hooks(struct rtw_hooks *hooks, const char *dvname,
void *arg)
{
if (hooks->rh_shutdown != NULL)
shutdownhook_disestablish(hooks->rh_shutdown);
}
static inline void
rtw_init_radiotap(struct rtw_softc *sc)
{
@ -4149,8 +4115,6 @@ rtw_attach(struct rtw_softc *sc)
sizeof(struct ieee80211_frame) + 64, &sc->sc_radiobpf);
#endif
rtw_establish_hooks(&sc->sc_hooks, sc->sc_dev.dv_xname, (void*)sc);
if (!pmf_device_register(&sc->sc_dev, NULL, NULL)) {
aprint_error_dev(&sc->sc_dev,
"couldn't establish power handler\n");
@ -4180,8 +4144,6 @@ rtw_detach(struct rtw_softc *sc)
rtw_stop(ifp, 1);
pmf_device_deregister(&sc->sc_dev);
rtw_disestablish_hooks(&sc->sc_hooks, sc->sc_dev.dv_xname,
(void*)sc);
callout_stop(&sc->sc_scan_ch);
ieee80211_ifdetach(&sc->sc_ic);
if_detach(ifp);

7
sys/dev/ic/rtwvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: rtwvar.h,v 1.33 2007/12/16 00:04:08 dyoung Exp $ */
/* $NetBSD: rtwvar.h,v 1.34 2007/12/20 18:47:23 dyoung Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
*
@ -281,10 +281,6 @@ enum rtw_attach_state {FINISHED, FINISH_DESCMAP_LOAD, FINISH_DESCMAP_CREATE,
FINISH_RF_ATTACH, FINISH_ID_STA, FINISH_TXDESCBLK_SETUP,
FINISH_TXCTLBLK_SETUP, DETACHED};
struct rtw_hooks {
void *rh_shutdown; /* shutdown hook */
};
struct rtw_mtbl {
int (*mt_newstate)(struct ieee80211com *,
enum ieee80211_state, int);
@ -466,7 +462,6 @@ struct rtw_softc {
int (*sc_enable)(struct rtw_softc *);
void (*sc_disable)(struct rtw_softc *);
struct rtw_mtbl sc_mtbl;
struct rtw_hooks sc_hooks;
void * sc_radiobpf;