|
@@ -1734,7 +1734,6 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
|
|
|
struct ath9k_hw_cal_data *caldata, bool fastcc)
|
|
|
{
|
|
|
struct ath_common *common = ath9k_hw_common(ah);
|
|
|
- struct timespec ts;
|
|
|
u32 saveLedState;
|
|
|
u32 saveDefAntenna;
|
|
|
u32 macStaId1;
|
|
@@ -1784,8 +1783,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
|
|
|
|
|
|
/* Save TSF before chip reset, a cold reset clears it */
|
|
|
tsf = ath9k_hw_gettsf64(ah);
|
|
|
- getrawmonotonic(&ts);
|
|
|
- usec = ts.tv_sec * 1000000ULL + ts.tv_nsec / 1000;
|
|
|
+ usec = ktime_to_us(ktime_get_raw());
|
|
|
|
|
|
saveLedState = REG_READ(ah, AR_CFG_LED) &
|
|
|
(AR_CFG_LED_ASSOC_CTL | AR_CFG_LED_MODE_SEL |
|
|
@@ -1818,8 +1816,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
|
|
|
}
|
|
|
|
|
|
/* Restore TSF */
|
|
|
- getrawmonotonic(&ts);
|
|
|
- usec = ts.tv_sec * 1000000ULL + ts.tv_nsec / 1000 - usec;
|
|
|
+ usec = ktime_to_us(ktime_get_raw()) - usec;
|
|
|
ath9k_hw_settsf64(ah, tsf + usec);
|
|
|
|
|
|
if (AR_SREV_9280_20_OR_LATER(ah))
|