aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/hw.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 5fb94fa45ff9..177244b2b6b9 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -40,7 +40,7 @@ static void ath9k_hw_spur_mitigate(struct ath_hw *ah, struct ath9k_channel *chan
40 40
41static u32 ath9k_hw_mac_usec(struct ath_hw *ah, u32 clks) 41static u32 ath9k_hw_mac_usec(struct ath_hw *ah, u32 clks)
42{ 42{
43 struct ieee80211_conf *conf = &ah->ah_sc->hw->conf; 43 struct ieee80211_conf *conf = &ath9k_hw_common(ah)->hw->conf;
44 44
45 if (!ah->curchan) /* should really check for CCK instead */ 45 if (!ah->curchan) /* should really check for CCK instead */
46 return clks / ATH9K_CLOCK_RATE_CCK; 46 return clks / ATH9K_CLOCK_RATE_CCK;
@@ -52,7 +52,7 @@ static u32 ath9k_hw_mac_usec(struct ath_hw *ah, u32 clks)
52 52
53static u32 ath9k_hw_mac_to_usec(struct ath_hw *ah, u32 clks) 53static u32 ath9k_hw_mac_to_usec(struct ath_hw *ah, u32 clks)
54{ 54{
55 struct ieee80211_conf *conf = &ah->ah_sc->hw->conf; 55 struct ieee80211_conf *conf = &ath9k_hw_common(ah)->hw->conf;
56 56
57 if (conf_is_ht40(conf)) 57 if (conf_is_ht40(conf))
58 return ath9k_hw_mac_usec(ah, clks) / 2; 58 return ath9k_hw_mac_usec(ah, clks) / 2;
@@ -62,7 +62,7 @@ static u32 ath9k_hw_mac_to_usec(struct ath_hw *ah, u32 clks)
62 62
63static u32 ath9k_hw_mac_clks(struct ath_hw *ah, u32 usecs) 63static u32 ath9k_hw_mac_clks(struct ath_hw *ah, u32 usecs)
64{ 64{
65 struct ieee80211_conf *conf = &ah->ah_sc->hw->conf; 65 struct ieee80211_conf *conf = &ath9k_hw_common(ah)->hw->conf;
66 66
67 if (!ah->curchan) /* should really check for CCK instead */ 67 if (!ah->curchan) /* should really check for CCK instead */
68 return usecs *ATH9K_CLOCK_RATE_CCK; 68 return usecs *ATH9K_CLOCK_RATE_CCK;
@@ -73,7 +73,7 @@ static u32 ath9k_hw_mac_clks(struct ath_hw *ah, u32 usecs)
73 73
74static u32 ath9k_hw_mac_to_clks(struct ath_hw *ah, u32 usecs) 74static u32 ath9k_hw_mac_to_clks(struct ath_hw *ah, u32 usecs)
75{ 75{
76 struct ieee80211_conf *conf = &ah->ah_sc->hw->conf; 76 struct ieee80211_conf *conf = &ath9k_hw_common(ah)->hw->conf;
77 77
78 if (conf_is_ht40(conf)) 78 if (conf_is_ht40(conf))
79 return ath9k_hw_mac_clks(ah, usecs) * 2; 79 return ath9k_hw_mac_clks(ah, usecs) * 2;