From 094507e8fede9ed92407b1684d7e7106a94a7644 Mon Sep 17 00:00:00 2001 From: hauke Date: Sat, 15 Aug 2009 08:26:38 +0000 Subject: [mac80211] Update to compat-wireless-2009-08-15 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17265 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...-use-ath9k_hw_wait-int-ath9k_hw_reset_tsf.patch | 52 ---------------------- 1 file changed, 52 deletions(-) delete mode 100644 package/mac80211/patches/405-ath9k-make-use-ath9k_hw_wait-int-ath9k_hw_reset_tsf.patch (limited to 'package/mac80211/patches/405-ath9k-make-use-ath9k_hw_wait-int-ath9k_hw_reset_tsf.patch') diff --git a/package/mac80211/patches/405-ath9k-make-use-ath9k_hw_wait-int-ath9k_hw_reset_tsf.patch b/package/mac80211/patches/405-ath9k-make-use-ath9k_hw_wait-int-ath9k_hw_reset_tsf.patch deleted file mode 100644 index b46e20ae7..000000000 --- a/package/mac80211/patches/405-ath9k-make-use-ath9k_hw_wait-int-ath9k_hw_reset_tsf.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 9a0a0221024ddb4ddf0e33bb6fdbb3b02eaaf292 Mon Sep 17 00:00:00 2001 -From: Gabor Juhos -Date: Sat, 20 Jun 2009 23:57:23 +0200 -Subject: [PATCH] ath9k: make use ath9k_hw_wait int ath9k_hw_reset_tsf - -We have a dedicated function for this kind of checks, use that -instead of duplicating the code. - -Changes-licensed-under: ISC -Signed-off-by: Gabor Juhos ---- - drivers/net/wireless/ath/ath9k/hw.c | 17 +++++------------ - drivers/net/wireless/ath/ath9k/hw.h | 1 + - 2 files changed, 6 insertions(+), 12 deletions(-) - ---- a/drivers/net/wireless/ath/ath9k/hw.c -+++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -3801,19 +3801,12 @@ void ath9k_hw_settsf64(struct ath_hw *ah - - void ath9k_hw_reset_tsf(struct ath_hw *ah) - { -- int count; -- - ath9k_ps_wakeup(ah->ah_sc); -- count = 0; -- while (REG_READ(ah, AR_SLP32_MODE) & AR_SLP32_TSF_WRITE_STATUS) { -- count++; -- if (count > 10) { -- DPRINTF(ah->ah_sc, ATH_DBG_RESET, -- "AR_SLP32_TSF_WRITE_STATUS limit exceeded\n"); -- break; -- } -- udelay(10); -- } -+ if (!ath9k_hw_wait(ah, AR_SLP32_MODE, AR_SLP32_TSF_WRITE_STATUS, 0, -+ AH_TSF_WRITE_TIMEOUT)) -+ DPRINTF(ah->ah_sc, ATH_DBG_RESET, -+ "AR_SLP32_TSF_WRITE_STATUS limit exceeded\n"); -+ - REG_WRITE(ah, AR_RESET_TSF, AR_RESET_TSF_ONCE); - ath9k_ps_restore(ah->ah_sc); - } ---- a/drivers/net/wireless/ath/ath9k/hw.h -+++ b/drivers/net/wireless/ath/ath9k/hw.h -@@ -95,6 +95,7 @@ - - #define MAX_RATE_POWER 63 - #define AH_WAIT_TIMEOUT 100000 /* (us) */ -+#define AH_TSF_WRITE_TIMEOUT 100 /* (us) */ - #define AH_TIME_QUANTUM 10 - #define AR_KEYTABLE_SIZE 128 - #define POWER_UP_TIME 200000 -- cgit v1.2.3