From c3639cf95a219f4ebbea6b813a137c945f16c22b Mon Sep 17 00:00:00 2001 From: Oleksij Rempel Date: Sat, 11 May 2013 12:06:34 +0200 Subject: [PATCH] use ah_set11nAggrFirst directly Signed-off-by: Oleksij Rempel --- target_firmware/wlan/if_athvar.h | 2 -- target_firmware/wlan/if_owl.c | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/target_firmware/wlan/if_athvar.h b/target_firmware/wlan/if_athvar.h index b69817c..f4ee58b 100755 --- a/target_firmware/wlan/if_athvar.h +++ b/target_firmware/wlan/if_athvar.h @@ -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) \ diff --git a/target_firmware/wlan/if_owl.c b/target_firmware/wlan/if_owl.c index 657c89b..5a06c59 100755 --- 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; -- 2.31.1