From 0e2687a7c0e9158fba897a210955810afa179de9 Mon Sep 17 00:00:00 2001 From: sam Date: Mon, 18 Sep 2006 16:16:02 +0000 Subject: remove stub radar support; it's never been used and future hal's will not include the calls (due to redesign) MFC after: 1 week --- sys/dev/ath/if_ath.c | 22 ---------------------- sys/dev/ath/if_athvar.h | 7 ------- 2 files changed, 29 deletions(-) (limited to 'sys/dev/ath') diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c index 0e121cc..5c03d42 100644 --- a/sys/dev/ath/if_ath.c +++ b/sys/dev/ath/if_ath.c @@ -117,7 +117,6 @@ static int ath_ioctl(struct ifnet *, u_long, caddr_t); static void ath_fatal_proc(void *, int); static void ath_rxorn_proc(void *, int); static void ath_bmiss_proc(void *, int); -static void ath_radar_proc(void *, int); static int ath_key_alloc(struct ieee80211com *, const struct ieee80211_key *, ieee80211_keyix *, ieee80211_keyix *); @@ -403,7 +402,6 @@ ath_attach(u_int16_t devid, struct ath_softc *sc) TASK_INIT(&sc->sc_rxorntask, 0, ath_rxorn_proc, sc); TASK_INIT(&sc->sc_bmisstask, 0, ath_bmiss_proc, sc); TASK_INIT(&sc->sc_bstucktask,0, ath_bstuck_proc, sc); - TASK_INIT(&sc->sc_radartask, 0, ath_radar_proc, sc); /* * Allocate hardware transmit queues: one queue for @@ -878,24 +876,6 @@ ath_bmiss_proc(void *arg, int pending) } } -static void -ath_radar_proc(void *arg, int pending) -{ - struct ath_softc *sc = arg; - struct ifnet *ifp = sc->sc_ifp; - struct ath_hal *ah = sc->sc_ah; - HAL_CHANNEL hchan; - - if (ath_hal_procdfs(ah, &hchan)) { - if_printf(ifp, "radar detected on channel %u/0x%x/0x%x\n", - hchan.channel, hchan.channelFlags, hchan.privFlags); - /* - * Initiate channel change. - */ - /* XXX not yet */ - } -} - static u_int ath_chan2flags(struct ieee80211com *ic, struct ieee80211_channel *chan) { @@ -3082,8 +3062,6 @@ rx_next: /* rx signal state monitoring */ ath_hal_rxmonitor(ah, &sc->sc_halstats, &sc->sc_curchan); - if (ath_hal_radar_event(ah)) - taskqueue_enqueue(sc->sc_tq, &sc->sc_radartask); if (ngood) sc->sc_lastrx = tsf; diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h index 46f7308..74ba0c5 100644 --- a/sys/dev/ath/if_athvar.h +++ b/sys/dev/ath/if_athvar.h @@ -256,7 +256,6 @@ struct ath_softc { u_int32_t *sc_rxlink; /* link ptr in last RX desc */ struct task sc_rxtask; /* rx int processing */ struct task sc_rxorntask; /* rxorn int processing */ - struct task sc_radartask; /* radar processing */ u_int8_t sc_defant; /* current default antenna */ u_int8_t sc_rxotherant; /* rx's on non-default antenna*/ u_int64_t sc_lastrx; /* tsf at last rx'd frame */ @@ -575,12 +574,6 @@ void ath_intr(void *); #define ath_hal_gpiosetintr(_ah, _gpio, _b) \ ((*(_ah)->ah_gpioSetIntr)((_ah), (_gpio), (_b))) -#define ath_hal_radar_event(_ah) \ - ((*(_ah)->ah_radarHaveEvent)((_ah))) -#define ath_hal_procdfs(_ah, _chan) \ - ((*(_ah)->ah_processDfs)((_ah), (_chan))) -#define ath_hal_checknol(_ah, _chan, _nchans) \ - ((*(_ah)->ah_dfsNolCheck)((_ah), (_chan), (_nchans))) #define ath_hal_radar_wait(_ah, _chan) \ ((*(_ah)->ah_radarWait)((_ah), (_chan))) -- cgit v1.1