From: Oleksij Rempel <linux@rempel-privat.de>
Date: Sat, 11 May 2013 08:39:21 +0000 (+0200)
Subject: use ah_getTsf64 directly
X-Git-Tag: 1.4.0~12^2^2~57
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=2b73a9f2be2b8ef125a6c196930741b011f30638;p=open-ath9k-htc-firmware.git

use ah_getTsf64 directly

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
---

diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c
index 46fde90..bdadbf0 100755
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -96,11 +96,12 @@ static a_uint16_t adf_os_cpu_to_le16(a_uint16_t x)
  */
 static u_int64_t ath_extend_tsf(struct ath_softc_tgt *sc, u_int32_t rstamp)
 {
+	struct ath_hal *ah = sc->sc_ah;
 	u_int64_t tsf;
 	u_int32_t tsf_low;
 	u_int64_t tsf64;
 
-	tsf = ath_hal_gettsf64(sc->sc_ah);
+	tsf = ah->ah_getTsf64(ah);
 	tsf_low = tsf & 0xffffffff;
 	tsf64 = (tsf & ~0xffffffffULL) | rstamp;
 
@@ -334,7 +335,7 @@ static void ath_uapsd_processtriggers(struct ath_softc_tgt *sc)
 	((struct ath_desc *)((caddr_t)(_sc)->sc_rxdma.dd_desc +		\
 			     ((_pa) - (_sc)->sc_rxdma.dd_desc_paddr)))
 
-	tsf = ath_hal_gettsf64(ah);
+	tsf = ah->ah_getTsf64(ah);
 	bf = asf_tailq_first(&sc->sc_rxbuf);
 
 	ds = asf_tailq_first(&sc->sc_rxdesc);
@@ -784,7 +785,7 @@ static void tgt_HTCRecv_cabhandler(HTC_ENDPOINT_ID EndPt, adf_nbuf_t hdr_buf,
 	a_uint32_t tmp;
 
 #ifdef ATH_ENABLE_CABQ
-	tsf = ath_hal_gettsf64(ah);
+	tsf = ah->ah_getTsf64(ah);
 	tmp = tsf - sc->sc_swba_tsf;
 
 	if ( tmp > ATH_CABQ_HANDLING_THRESHOLD ) {
@@ -1035,9 +1036,9 @@ adf_os_irq_resp_t ath_intr(adf_drv_handle_t hdl)
 			WMI_SWBA_EVENT swbaEvt;
 			struct ath_txq *txq = ATH_TXQ(sc, 8);
 
-			swbaEvt.tsf = ath_hal_gettsf64(ah);
+			swbaEvt.tsf = ah->ah_getTsf64(ah);
 			swbaEvt.beaconPendingCount = ah->ah_numTxPending(ah, sc->sc_bhalq);
-			sc->sc_swba_tsf = ath_hal_gettsf64(ah);
+			sc->sc_swba_tsf = ah->ah_getTsf64(ah);
 
 			wmi_event(sc->tgt_wmi_handle,
 				  WMI_SWBA_EVENTID,
diff --git a/target_firmware/wlan/if_athvar.h b/target_firmware/wlan/if_athvar.h
index a04f1da..9a94cfd 100755
--- a/target_firmware/wlan/if_athvar.h
+++ b/target_firmware/wlan/if_athvar.h
@@ -541,8 +541,6 @@ a_uint8_t ath_get_minrateidx(struct ath_softc_tgt *sc, struct ath_vap_target *av
     (ath_hal_getcapability(_ah, HAL_CAP_RTS_AGGR_LIMIT, 0, _pv) == HAL_OK)
 #define ath_hal_setrxfilter(_ah, _filter) \
     ((*(_ah)->ah_setRxFilter)((_ah), (_filter)))
-#define ath_hal_gettsf64(_ah) \
-    ((*(_ah)->ah_getTsf64)((_ah)))
 #define ath_hal_intrset(_ah, _mask) \
     ((*(_ah)->ah_setInterrupts)((_ah), (_mask)))
 #define ath_hal_set11n_aggr_first(_ah, _ds, _aggrlen, _numdelims) \