use ah_setupTxDesc directly

[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 657c89b296eecda28deaa718862ee1ecd08c0c82..f8cfd6448480ad71cd0401d6b176460c1db6cceb 100755 (executable)
--- a/target_firmware/wlan/if_owl.c
+++ b/target_firmware/wlan/if_owl.c
@@ -983,10 +983,11 @@ ath_tx_freebuf(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
 {
        a_int32_t i ;
        struct ath_tx_desc *bfd = NULL;
+       struct ath_hal *ah = sc->sc_ah;
 
        for (bfd = bf->bf_desc, i = 0; i < bf->bf_dmamap_info.nsegs; bfd++, i++) {
-               ath_hal_clr11n_aggr(sc->sc_ah, bfd);
-               ath_hal_set11n_burstduration(sc->sc_ah, bfd, 0);
+               ah->ah_clr11nAggr(ah, bfd);
+               ah->ah_set11nBurstDuration(ah, bfd, 0);
                ath_hal_set11n_virtualmorefrag(sc->sc_ah, bfd, 0);
        }
 
@@ -1198,7 +1199,7 @@ ath_tgt_send_mgt(struct ath_softc_tgt *sc,adf_nbuf_t hdr_buf, adf_nbuf_t skb,
 
        flags |= HAL_TXDESC_INTREQ;
 
-       ath_hal_setuptxdesc(ah, ds
+       ah->ah_setupTxDesc(ah, ds
                            , pktlen
                            , hdrlen
                            , atype
@@ -1379,6 +1380,7 @@ ath_tgt_tx_sched_aggr(struct ath_softc_tgt *sc, ath_atx_tid_t *tid)
        ath_tx_bufhead bf_q;
        struct ath_txq *txq = TID_TO_ACTXQ(tid->tidno);
        struct ath_tx_desc *ds = NULL;
+       struct ath_hal *ah = sc->sc_ah;
        int i;
 
 
@@ -1409,7 +1411,7 @@ ath_tgt_tx_sched_aggr(struct ath_softc_tgt *sc, ath_atx_tid_t *tid)
                        bf->bf_next = NULL;
 
                        for(ds = bf->bf_desc; ds <= bf->bf_lastds; ds++)
-                               ath_hal_clr11n_aggr(sc->sc_ah, ds);
+                               ah->ah_clr11nAggr(ah, ds);
 
                        ath_buf_set_rate(sc, bf);
                        bf->bf_txq_add(sc, bf);
@@ -1423,12 +1425,12 @@ ath_tgt_tx_sched_aggr(struct ath_softc_tgt *sc, ath_atx_tid_t *tid)
 
                bf->bf_isaggr  = 1;
                ath_buf_set_rate(sc, bf);
-               ath_hal_set11n_aggr_first(sc->sc_ah, bf->bf_desc, bf->bf_al,
+               ah->ah_set11nAggrFirst(ah, bf->bf_desc, bf->bf_al,
                                          bf->bf_ndelim);
                bf->bf_lastds = bf_last->bf_lastds;
 
                for (i = 0; i < bf_last->bf_dmamap_info.nsegs; i++)
-                       ath_hal_set11n_aggr_last(sc->sc_ah, &bf_last->bf_descarr[i]);
+                       ah->ah_set11nAggrLast(ah, &bf_last->bf_descarr[i]);
 
                if (status == ATH_AGGR_8K_LIMITED) {
                        adf_os_assert(0);
@@ -1496,6 +1498,7 @@ int ath_tgt_tx_form_aggr(struct ath_softc_tgt *sc, ath_atx_tid_t *tid,
        int nframes = 0, rl = 0;;
        struct ath_tx_desc *ds = NULL;
        struct ath_tx_buf *bf;
+       struct ath_hal *ah = sc->sc_ah;
        u_int16_t aggr_limit =  (64*1024 -1), al = 0, bpad = 0, al_delta;
        u_int16_t h_baw = tid->baw_size/2, prev_al = 0, prev_frames = 0;
 
@@ -1572,7 +1575,7 @@ int ath_tgt_tx_form_aggr(struct ath_softc_tgt *sc, ath_atx_tid_t *tid,
                bf_prev = bf;
 
                for(ds = bf->bf_desc; ds <= bf->bf_lastds; ds++)
-                       ath_hal_set11n_aggr_middle(sc->sc_ah, ds, bf->bf_ndelim);
+                       ah->ah_set11nAggrMiddle(ah, ds, bf->bf_ndelim);
 
        } while (!asf_tailq_empty(&tid->buf_q));
 
@@ -1801,13 +1804,14 @@ ath_tx_retry_subframe(struct ath_softc_tgt *sc, struct ath_tx_buf *bf,
        struct ath_node_target *an = ATH_NODE_TARGET(bf->bf_node);
        ath_atx_tid_t *tid = ATH_AN_2_TID(an, bf->bf_tidno);
        struct ath_tx_desc *ds = NULL;
+       struct ath_hal *ah = sc->sc_ah;
        int i = 0;
 
        __stats(sc, txaggr_compretries);
 
        for(ds = bf->bf_desc, i = 0; i < bf->bf_dmamap_info.nsegs; ds++, i++) {
-               ath_hal_clr11n_aggr(sc->sc_ah, ds);
-               ath_hal_set11n_burstduration(sc->sc_ah, ds, 0);
+               ah->ah_clr11nAggr(ah, ds);
+               ah->ah_set11nBurstDuration(ah, ds, 0);
                ath_hal_set11n_virtualmorefrag(sc->sc_ah, ds, 0);
        }
 
@@ -2123,7 +2127,7 @@ static void ath_bar_tx(struct ath_softc_tgt *sc,
        adf_nbuf_dmamap_info(bf->bf_dmamap, &bf->bf_dmamap_info);
 
        ds = bf->bf_desc;
-       ath_hal_setuptxdesc(sc->sc_ah, ds
+       ah->ah_setupTxDesc(ah, ds
                            , adf_nbuf_len(skb) + IEEE80211_CRC_LEN
                            , 0
                            , HAL_PKT_TYPE_NORMAL
@@ -2142,7 +2146,7 @@ static void ath_bar_tx(struct ath_softc_tgt *sc,
        bf->bf_next = NULL;
 
        for (ds0 = ds, i=0; i < bf->bf_dmamap_info.nsegs; ds0++, i++) {
-               ath_hal_clr11n_aggr(sc->sc_ah, ds0);
+               ah->ah_clr11nAggr(ah, ds0);
        }
 
        ath_filltxdesc(sc, bf);