diff options
author | sam <sam@FreeBSD.org> | 2008-11-24 01:31:10 +0000 |
---|---|---|
committer | sam <sam@FreeBSD.org> | 2008-11-24 01:31:10 +0000 |
commit | 62849db7186fd3cef162c0cce267796097c13483 (patch) | |
tree | eaa542b7edb1c3cf0d70222896cd8c8ca620e200 | |
parent | 21faee572732b2ab3110905fdb10e713ed14390c (diff) | |
download | FreeBSD-src-62849db7186fd3cef162c0cce267796097c13483.zip FreeBSD-src-62849db7186fd3cef162c0cce267796097c13483.tar.gz |
nuke special handling of RXORN interrupt; the hal marks the FATAL
bit in the interrupt status when RXORN is hit and the chip requires
a reset so our special handling was causing useless resets
-rw-r--r-- | sys/dev/ath/if_ath.c | 20 | ||||
-rw-r--r-- | sys/dev/ath/if_athvar.h | 1 |
2 files changed, 4 insertions, 17 deletions
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c index f445811..dc7c71c 100644 --- a/sys/dev/ath/if_ath.c +++ b/sys/dev/ath/if_ath.c @@ -131,7 +131,6 @@ static int ath_media_change(struct ifnet *); static void ath_watchdog(struct ifnet *); 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_vap(struct ieee80211vap *); static void ath_bmiss_proc(void *, int); static int ath_keyset(struct ath_softc *, const struct ieee80211_key *, @@ -409,7 +408,6 @@ ath_attach(u_int16_t devid, struct ath_softc *sc) "%s taskq", ifp->if_xname); TASK_INIT(&sc->sc_rxtask, 0, ath_rx_proc, 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); @@ -1184,10 +1182,6 @@ ath_intr(void *arg) sc->sc_stats.ast_hardware++; ath_hal_intrset(ah, 0); /* disable intr's until reset */ ath_fatal_proc(sc, 0); - } else if (status & HAL_INT_RXORN) { - sc->sc_stats.ast_rxorn++; - ath_hal_intrset(ah, 0); /* disable intr's until reset */ - taskqueue_enqueue(sc->sc_tq, &sc->sc_rxorntask); } else { if (status & HAL_INT_SWBA) { /* @@ -1234,6 +1228,10 @@ ath_intr(void *arg) ath_hal_mibevent(ah, &sc->sc_halstats); ath_hal_intrset(ah, sc->sc_imask); } + if (status & HAL_INT_RXORN) { + /* NB: hal marks HAL_INT_FATAL when RXORN is fatal */ + sc->sc_stats.ast_rxorn++; + } } } @@ -1263,16 +1261,6 @@ ath_fatal_proc(void *arg, int pending) } static void -ath_rxorn_proc(void *arg, int pending) -{ - struct ath_softc *sc = arg; - struct ifnet *ifp = sc->sc_ifp; - - if_printf(ifp, "rx FIFO overrun; resetting\n"); - ath_reset(ifp); -} - -static void ath_bmiss_vap(struct ieee80211vap *vap) { struct ath_softc *sc = vap->iv_ic->ic_ifp->if_softc; diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h index f67c44a..982a4ef 100644 --- a/sys/dev/ath/if_athvar.h +++ b/sys/dev/ath/if_athvar.h @@ -302,7 +302,6 @@ struct ath_softc { struct mbuf *sc_rxpending; /* pending receive data */ 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 */ 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 */ |