diff options
| author | John W. Linville | 2011-03-15 19:16:48 +0100 |
|---|---|---|
| committer | John W. Linville | 2011-03-15 19:16:48 +0100 |
| commit | 106af2c99a5249b809aaed45b8353ac087821f4a (patch) | |
| tree | b9d13cc35cfdc3b763408287b4e50daf32fda53b /drivers/net/wireless/ath/ath9k/mac.h | |
| parent | net: dcbnl: Add IEEE app selector value definitions (diff) | |
| parent | ath9k: fix aggregation related interoperability issues (diff) | |
| download | kernel-qcow2-linux-106af2c99a5249b809aaed45b8353ac087821f4a.tar.gz kernel-qcow2-linux-106af2c99a5249b809aaed45b8353ac087821f4a.tar.xz kernel-qcow2-linux-106af2c99a5249b809aaed45b8353ac087821f4a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/mac.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/mac.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/mac.h b/drivers/net/wireless/ath/ath9k/mac.h index 04d58ae923bb..b2b2ff852c32 100644 --- a/drivers/net/wireless/ath/ath9k/mac.h +++ b/drivers/net/wireless/ath/ath9k/mac.h @@ -676,7 +676,8 @@ void ath9k_hw_txstart(struct ath_hw *ah, u32 q); void ath9k_hw_cleartxdesc(struct ath_hw *ah, void *ds); u32 ath9k_hw_numtxpending(struct ath_hw *ah, u32 q); bool ath9k_hw_updatetxtriglevel(struct ath_hw *ah, bool bIncTrigLevel); -bool ath9k_hw_stoptxdma(struct ath_hw *ah, u32 q); +bool ath9k_hw_stop_dma_queue(struct ath_hw *ah, u32 q); +void ath9k_hw_abort_tx_dma(struct ath_hw *ah); void ath9k_hw_gettxintrtxqs(struct ath_hw *ah, u32 *txqs); bool ath9k_hw_set_txq_props(struct ath_hw *ah, int q, const struct ath9k_tx_queue_info *qinfo); |