remove unused variables in ath_hal_getcapability

[open-ath9k-htc-firmware.git] / target_firmware / wlan / if_owl.c

diff --git a/target_firmware/wlan/if_owl.c b/target_firmware/wlan/if_owl.c
index 4cce3e65784acc23b5250b9a58e4b9c9b4b6dea3..b7df875d57f321fc439db48956b8b0415ccce591 100755 (executable)
--- a/target_firmware/wlan/if_owl.c
+++ b/target_firmware/wlan/if_owl.c
@@ -387,7 +387,7 @@ static void ath_buf_set_rate(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
            cix = rt->info[sc->sc_protrix].controlRate;
            prot_mode = AH_TRUE;
     } else {
-           if (ath_hal_htsupported(ah) && (!bf->bf_ismcast))
+           if (ath_hal_getcapability(ah, HAL_CAP_HT) && (!bf->bf_ismcast))
                    flags = HAL_TXDESC_RTSENA;
 
            for (i = 4; i--;) {
@@ -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);
 
@@ -989,7 +990,7 @@ ath_tx_freebuf(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
        for (bfd = bf->bf_desc, i = 0; i < bf->bf_dmamap_info.nsegs; bfd++, i++) {
                ah->ah_clr11nAggr(ah, bfd);
                ah->ah_set11nBurstDuration(ah, bfd, 0);
-               ath_hal_set11n_virtualmorefrag(sc->sc_ah, bfd, 0);
+               ah->ah_set11nVirtualMoreFrag(ah, bfd, 0);
        }
 
        ath_dma_unmap(sc, bf);
@@ -1813,7 +1814,7 @@ ath_tx_retry_subframe(struct ath_softc_tgt *sc, struct ath_tx_buf *bf,
        for(ds = bf->bf_desc, i = 0; i < bf->bf_dmamap_info.nsegs; ds++, i++) {
                ah->ah_clr11nAggr(ah, ds);
                ah->ah_set11nBurstDuration(ah, ds, 0);
-               ath_hal_set11n_virtualmorefrag(sc->sc_ah, ds, 0);
+               ah->ah_set11nVirtualMoreFrag(ah, ds, 0);
        }
 
        if (bf->bf_retries >= OWLMAX_RETRIES) {