From 60b9031eb5a7620d8862d8b23ce04855fb645e76 Mon Sep 17 00:00:00 2001 From: Oleksij Rempel Date: Sat, 11 May 2013 12:12:06 +0200 Subject: [PATCH] use ah_set11nAggrMiddle 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 f4ee58b..909b3f2 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_middle(_ah, _ds, _numdelims) \ - ((*(_ah)->ah_set11nAggrMiddle)(_ah, _ds, _numdelims)) #define ath_hal_set11n_aggr_last(_ah, _ds) \ ((*(_ah)->ah_set11nAggrLast)(_ah, _ds)) diff --git a/target_firmware/wlan/if_owl.c b/target_firmware/wlan/if_owl.c index 5a06c59..f1876e2 100755 --- a/target_firmware/wlan/if_owl.c +++ b/target_firmware/wlan/if_owl.c @@ -1497,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; @@ -1573,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)); -- 2.31.1