mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-15 12:54:27 +00:00
Revert "[ath] Attempt to fix epoch handling."
This reverts commit af2441fbc7
.
Sponsored by: The FreeBSD Foundation
MFC after: 3 days
This commit is contained in:
parent
75f298492a
commit
eb3821e6d9
|
@ -758,7 +758,7 @@ ath_attach(u_int16_t devid, struct ath_softc *sc)
|
|||
taskqueue_start_threads(&sc->sc_tq, 1, PI_NET, "%s taskq",
|
||||
device_get_nameunit(sc->sc_dev));
|
||||
|
||||
TASK_INIT(&sc->sc_rxtask, 0, sc->sc_rx.recv_tasklet, sc);
|
||||
NET_TASK_INIT(&sc->sc_rxtask, 0, sc->sc_rx.recv_tasklet, sc);
|
||||
TASK_INIT(&sc->sc_bmisstask, 0, ath_bmiss_proc, sc);
|
||||
TASK_INIT(&sc->sc_tsfoortask, 0, ath_tsfoor_proc, sc);
|
||||
TASK_INIT(&sc->sc_bstucktask,0, ath_bstuck_proc, sc);
|
||||
|
|
|
@ -667,8 +667,6 @@ ath_rx_pkt(struct ath_softc *sc, struct ath_rx_status *rs, HAL_STATUS status,
|
|||
int is_good = 0;
|
||||
struct ath_rx_edma *re = &sc->sc_rxedma[qtype];
|
||||
|
||||
NET_EPOCH_ASSERT();
|
||||
|
||||
/*
|
||||
* Calculate the correct 64 bit TSF given
|
||||
* the TSF64 register value and rs_tstamp.
|
||||
|
@ -1090,8 +1088,6 @@ ath_rx_proc(struct ath_softc *sc, int resched)
|
|||
int kickpcu = 0;
|
||||
int ret;
|
||||
|
||||
NET_EPOCH_ASSERT();
|
||||
|
||||
/* XXX we must not hold the ATH_LOCK here */
|
||||
ATH_UNLOCK_ASSERT(sc);
|
||||
ATH_PCU_UNLOCK_ASSERT(sc);
|
||||
|
@ -1311,7 +1307,6 @@ static void
|
|||
ath_legacy_rx_tasklet(void *arg, int npending)
|
||||
{
|
||||
struct ath_softc *sc = arg;
|
||||
struct epoch_tracker et;
|
||||
|
||||
ATH_KTR(sc, ATH_KTR_RXPROC, 1, "ath_rx_proc: pending=%d", npending);
|
||||
DPRINTF(sc, ATH_DEBUG_RX_PROC, "%s: pending %u\n", __func__, npending);
|
||||
|
@ -1324,18 +1319,14 @@ ath_legacy_rx_tasklet(void *arg, int npending)
|
|||
}
|
||||
ATH_PCU_UNLOCK(sc);
|
||||
|
||||
NET_EPOCH_ENTER(et);
|
||||
ath_rx_proc(sc, 1);
|
||||
NET_EPOCH_EXIT(et);
|
||||
}
|
||||
|
||||
static void
|
||||
ath_legacy_flushrecv(struct ath_softc *sc)
|
||||
{
|
||||
struct epoch_tracker et;
|
||||
NET_EPOCH_ENTER(et);
|
||||
|
||||
ath_rx_proc(sc, 0);
|
||||
NET_EPOCH_EXIT(et);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -555,7 +555,6 @@ ath_edma_recv_proc_deferred_queue(struct ath_softc *sc, HAL_RX_QUEUE qtype,
|
|||
int16_t nf;
|
||||
ath_bufhead rxlist;
|
||||
struct mbuf *m;
|
||||
struct epoch_tracker et;
|
||||
|
||||
TAILQ_INIT(&rxlist);
|
||||
|
||||
|
@ -572,8 +571,6 @@ ath_edma_recv_proc_deferred_queue(struct ath_softc *sc, HAL_RX_QUEUE qtype,
|
|||
TAILQ_CONCAT(&rxlist, &sc->sc_rx_rxlist[qtype], bf_list);
|
||||
ATH_RX_UNLOCK(sc);
|
||||
|
||||
NET_EPOCH_ENTER(et);
|
||||
|
||||
/* Handle the completed descriptors */
|
||||
/*
|
||||
* XXX is this SAFE call needed? The ath_buf entries
|
||||
|
@ -597,7 +594,6 @@ ath_edma_recv_proc_deferred_queue(struct ath_softc *sc, HAL_RX_QUEUE qtype,
|
|||
if (ngood) {
|
||||
sc->sc_lastrx = tsf;
|
||||
}
|
||||
NET_EPOCH_EXIT(et);
|
||||
|
||||
ATH_KTR(sc, ATH_KTR_INTERRUPTS, 1,
|
||||
"ath edma rx deferred proc: ngood=%d\n",
|
||||
|
|
Loading…
Reference in a new issue