diff options
Diffstat (limited to 'sys/dev/ath/if_athvar.h')
| -rw-r--r-- | sys/dev/ath/if_athvar.h | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h index 38fd484..7c70252 100644 --- a/sys/dev/ath/if_athvar.h +++ b/sys/dev/ath/if_athvar.h @@ -105,17 +105,15 @@ struct ath_buf; */ struct ath_tid { TAILQ_HEAD(,ath_buf) tid_q; /* pending buffers */ - u_int axq_depth; /* SW queue depth */ - char axq_name[48]; /* lock name */ struct ath_node *an; /* pointer to parent */ int tid; /* tid */ int ac; /* which AC gets this trafic */ int hwq_depth; /* how many buffers are on HW */ + u_int axq_depth; /* SW queue depth */ struct { TAILQ_HEAD(,ath_buf) tid_q; /* filtered queue */ u_int axq_depth; /* SW queue depth */ - char axq_name[48]; /* lock name */ } filtq; /* @@ -332,7 +330,6 @@ struct ath_txq { u_int axq_intrcnt; /* interrupt count */ u_int32_t *axq_link; /* link ptr in last TX desc */ TAILQ_HEAD(axq_q_s, ath_buf) axq_q; /* transmit queue */ - struct mtx axq_lock; /* lock on q and link */ char axq_name[12]; /* e.g. "ath0_txq4" */ /* Per-TID traffic queue for software -> hardware TX */ @@ -345,25 +342,6 @@ struct ath_txq { #define ATH_NODE_UNLOCK_ASSERT(_an) mtx_assert(&(_an)->an_mtx, \ MA_NOTOWNED) -#define ATH_TXQ_LOCK_INIT(_sc, _tq) do { \ - snprintf((_tq)->axq_name, sizeof((_tq)->axq_name), "%s_txq%u", \ - device_get_nameunit((_sc)->sc_dev), (_tq)->axq_qnum); \ - mtx_init(&(_tq)->axq_lock, (_tq)->axq_name, NULL, MTX_DEF); \ -} while (0) -#define ATH_TXQ_LOCK_DESTROY(_tq) mtx_destroy(&(_tq)->axq_lock) -#define ATH_TXQ_LOCK(_tq) mtx_lock(&(_tq)->axq_lock) -#define ATH_TXQ_UNLOCK(_tq) mtx_unlock(&(_tq)->axq_lock) -#define ATH_TXQ_LOCK_ASSERT(_tq) \ - mtx_assert(&(_tq)->axq_lock, MA_OWNED) -#define ATH_TXQ_UNLOCK_ASSERT(_tq) \ - mtx_assert(&(_tq)->axq_lock, MA_NOTOWNED) -#define ATH_TXQ_IS_LOCKED(_tq) mtx_owned(&(_tq)->axq_lock) - -#define ATH_TID_LOCK_ASSERT(_sc, _tid) \ - ATH_TXQ_LOCK_ASSERT((_sc)->sc_ac2q[(_tid)->ac]) -#define ATH_TID_UNLOCK_ASSERT(_sc, _tid) \ - ATH_TXQ_UNLOCK_ASSERT((_sc)->sc_ac2q[(_tid)->ac]) - /* * These are for the hardware queue. */ @@ -969,6 +947,8 @@ void ath_intr(void *); OS_REG_READ(_ah, AR_TSF_L32) #define ath_hal_gettsf64(_ah) \ ((*(_ah)->ah_getTsf64)((_ah))) +#define ath_hal_settsf64(_ah, _val) \ + ((*(_ah)->ah_setTsf64)((_ah), (_val))) #define ath_hal_resettsf(_ah) \ ((*(_ah)->ah_resetTsf)((_ah))) #define ath_hal_rxena(_ah) \ |
