diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-04-26 15:39:10 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-26 15:39:10 -0400 |
| commit | 429576b97c623b9c4e3375fb7c37bce377f51e68 (patch) | |
| tree | dc4fd40ae54d177ddb3cb3991e8c3ff019eef238 /drivers/net/wireless/ath/ath9k/mac.h | |
| parent | 9835a30e980561082beb02ce724f6e555787bc19 (diff) | |
| parent | 069f40fc07f6df3da325e7ea1698a0d6247983d5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/mac.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/mac.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/mac.h b/drivers/net/wireless/ath/ath9k/mac.h index a60edb44127b..b60c130917f7 100644 --- a/drivers/net/wireless/ath/ath9k/mac.h +++ b/drivers/net/wireless/ath/ath9k/mac.h @@ -694,7 +694,7 @@ bool ath9k_hw_setrxabort(struct ath_hw *ah, bool set); void ath9k_hw_putrxbuf(struct ath_hw *ah, u32 rxdp); void ath9k_hw_startpcureceive(struct ath_hw *ah, bool is_scanning); void ath9k_hw_abortpcurecv(struct ath_hw *ah); -bool ath9k_hw_stopdmarecv(struct ath_hw *ah); +bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset); int ath9k_hw_beaconq_setup(struct ath_hw *ah); /* Interrupt Handling */ |