aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath5k/reset.c
diff options
context:
space:
mode:
authorNick Kossifidis <mickflemm@gmail.com>2010-11-23 13:41:15 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-11-30 13:52:30 -0500
commitd41174fabdae348c6583cf05aeb329da232c342c (patch)
tree6f1979e64f748c8f6c060c28804424a79f49b0d6 /drivers/net/wireless/ath/ath5k/reset.c
parent9320b5c4a7260d9593102f378201d17e3f030739 (diff)
ath5k: Add new function to stop rx/tx DMA
* Add a new function to stop rx/tx dma and use in when reset starts Signed-off-by: Nick Kossifidis <mickflemm@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/reset.c')
-rw-r--r--drivers/net/wireless/ath/ath5k/reset.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c
index 9dd5792780ba..083367712d67 100644
--- a/drivers/net/wireless/ath/ath5k/reset.c
+++ b/drivers/net/wireless/ath/ath5k/reset.c
@@ -823,6 +823,14 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
823 mode = 0; 823 mode = 0;
824 824
825 /* 825 /*
826 * Stop DMA
827 *
828 * Note: If DMA didn't stop continue
829 * since only a reset will fix it.
830 */
831 ath5k_hw_dma_stop(ah);
832
833 /*
826 * Save some registers before a reset 834 * Save some registers before a reset
827 */ 835 */
828 /*DCU/Antenna selection not available on 5210*/ 836 /*DCU/Antenna selection not available on 5210*/
@@ -1015,11 +1023,6 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
1015 */ 1023 */
1016 ath5k_hw_pcu_init(ah, op_mode, mode); 1024 ath5k_hw_pcu_init(ah, op_mode, mode);
1017 1025
1018 /* Clear any pending interrupts
1019 * PISR/SISR Not available on 5210 */
1020 if (ah->ah_version != AR5K_AR5210)
1021 ath5k_hw_reg_write(ah, 0xffffffff, AR5K_PISR);
1022
1023 /* 1026 /*
1024 * Initialize PHY 1027 * Initialize PHY
1025 */ 1028 */