use ah_set11nAggrMiddle 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..f1876e239cd909e571e89f1499b25d3bfefc5b28 100755 (executable)
--- a/target_firmware/wlan/if_owl.c
+++ b/target_firmware/wlan/if_owl.c
@@ -1379,6 +1379,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;
 
 
@@ -1423,7 +1424,7 @@ 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;
 
@@ -1496,6 +1497,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 +1574,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));