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

use ah_procTxDesc directly

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

diff --git a/target_firmware/wlan/if_athvar.h b/target_firmware/wlan/if_athvar.h
index bddebce..c378b58 100755
--- a/target_firmware/wlan/if_athvar.h
+++ b/target_firmware/wlan/if_athvar.h
@@ -491,8 +491,6 @@ a_uint8_t ath_get_minrateidx(struct ath_softc_tgt *sc, struct ath_vap_target *av
 
 #define ath_hal_set11n_virtualmorefrag(_ah, _ds, _vmf) \
     ((*(_ah)->ah_set11nVirtualMoreFrag)(_ah, _ds, _vmf))
-#define ath_hal_txprocdesc(_ah, _ds) \
-    ((*(_ah)->ah_procTxDesc)((_ah), (_ds)))
 #define ath_hal_htsupported(_ah) \
     (ath_hal_getcapability(_ah, HAL_CAP_HT, 0, NULL) == HAL_OK)
 #define ath_hal_getrtsaggrlimit(_ah, _pv) \
diff --git a/target_firmware/wlan/if_owl.c b/target_firmware/wlan/if_owl.c
index 4cce3e6..00a9129 100755
--- a/target_firmware/wlan/if_owl.c
+++ b/target_firmware/wlan/if_owl.c
@@ -651,6 +651,7 @@ void owltgt_tx_processq(struct ath_softc_tgt *sc, struct ath_txq *txq,
 {
 	struct ath_tx_buf *bf;
 	struct ath_tx_desc *ds;
+	struct ath_hal *ah = sc->sc_ah;
 	HAL_STATUS status;
 
 	for (;;) {
@@ -663,7 +664,7 @@ void owltgt_tx_processq(struct ath_softc_tgt *sc, struct ath_txq *txq,
 		bf = asf_tailq_first(&txq->axq_q);
 
 		ds = bf->bf_lastds;
-		status = ath_hal_txprocdesc(sc->sc_ah, ds);
+		status = ah->ah_procTxDesc(ah, ds);
 
 		if (status == HAL_EINPROGRESS) {
 			if (txqstate == OWL_TXQ_ACTIVE)
@@ -886,7 +887,7 @@ static void ath_tgt_txq_add_ucast(struct ath_softc_tgt *sc, struct ath_tx_buf *b
 
 	txq = bf->bf_txq;
 
-	status = ath_hal_txprocdesc(sc->sc_ah, bf->bf_lastds);
+	status = ah->ah_procTxDesc(ah, bf->bf_lastds);
 
 	ATH_TXQ_INSERT_TAIL(txq, bf, bf_list);