diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-14 13:16:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-14 13:16:51 -0700 |
| commit | dd5030404695d81792a21cba575e02b21a2f275a (patch) | |
| tree | 3444db9d86b9a9c325066fd5fd2bc62397f1a04a /drivers/net/wireless/ath/ath9k/mac.h | |
| parent | 38a2f37258f9e2ae3f6e4241e01088be8dfaf4e9 (diff) | |
| parent | 332704a51498a7e29aa92c19dc03f11f80b71bfe (diff) | |
| download | op-kernel-dev-dd5030404695d81792a21cba575e02b21a2f275a.zip op-kernel-dev-dd5030404695d81792a21cba575e02b21a2f275a.tar.gz | |
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 b2b2ff8..c2a5938 100644 --- a/drivers/net/wireless/ath/ath9k/mac.h +++ b/drivers/net/wireless/ath/ath9k/mac.h @@ -695,7 +695,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 */ |
