use ah_set11nAggrFirst directly
authorOleksij Rempel <linux@rempel-privat.de>
Sat, 11 May 2013 10:06:34 +0000 (12:06 +0200)
committerOleksij Rempel <linux@rempel-privat.de>
Sat, 11 May 2013 14:10:08 +0000 (16:10 +0200)
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
target_firmware/wlan/if_athvar.h
target_firmware/wlan/if_owl.c

index b69817c59a17be5def7dbea3988630354da99c7f..f4ee58b0c62153d4d4973399b6119472b6aedcf0 100755 (executable)
@@ -517,8 +517,6 @@ a_uint8_t ath_get_minrateidx(struct ath_softc_tgt *sc, struct ath_vap_target *av
     (ath_hal_getcapability(_ah, HAL_CAP_HT, 0, NULL) == HAL_OK)
 #define ath_hal_getrtsaggrlimit(_ah, _pv) \
     (ath_hal_getcapability(_ah, HAL_CAP_RTS_AGGR_LIMIT, 0, _pv) == HAL_OK)
-#define ath_hal_set11n_aggr_first(_ah, _ds, _aggrlen, _numdelims) \
-    ((*(_ah)->ah_set11nAggrFirst)(_ah, _ds, _aggrlen, _numdelims))
 #define ath_hal_set11n_aggr_middle(_ah, _ds, _numdelims) \
     ((*(_ah)->ah_set11nAggrMiddle)(_ah, _ds, _numdelims))
 #define ath_hal_set11n_aggr_last(_ah, _ds) \
index 657c89b296eecda28deaa718862ee1ecd08c0c82..5a06c599f7f2046ad32c383b6bdc35ecb7c4be70 100755 (executable)
@@ -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;