From f8b7df1c08ced2b3bde10b48fb7970d2c8910ad1 Mon Sep 17 00:00:00 2001 From: Oleksij Rempel Date: Sat, 11 May 2013 09:40:29 +0200 Subject: [PATCH] use ah_getRateTable directly Signed-off-by: Oleksij Rempel --- target_firmware/wlan/ah.h | 3 --- target_firmware/wlan/if_ath.c | 5 +++-- target_firmware/wlan/if_athvar.h | 2 -- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/target_firmware/wlan/ah.h b/target_firmware/wlan/ah.h index 67ca199..6b9f2b7 100755 --- a/target_firmware/wlan/ah.h +++ b/target_firmware/wlan/ah.h @@ -476,9 +476,6 @@ extern struct ath_hal * __ahdecl ath_hal_attach_tgt(a_uint32_t devid, HAL_SOFTC, adf_os_device_t dev, a_uint32_t flags, HAL_STATUS* status); -extern const HAL_RATE_TABLE * __ahdecl ath_hal_getratetable(struct ath_hal *, - a_uint32_t mode); - extern a_uint16_t __ahdecl ath_hal_computetxtime(struct ath_hal *, const HAL_RATE_TABLE *rates, a_uint32_t frameLen, diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c index 25d41ff..889d1b4 100755 --- a/target_firmware/wlan/if_ath.c +++ b/target_firmware/wlan/if_ath.c @@ -55,6 +55,7 @@ #include "if_athrate.h" #include "if_athvar.h" #include "ah_desc.h" +#include "ah.h" static a_int32_t ath_numrxbufs = -1; static a_int32_t ath_numrxdescs = -1; @@ -119,10 +120,10 @@ static a_int32_t ath_rate_setup(struct ath_softc_tgt *sc, a_uint32_t mode) switch (mode) { case IEEE80211_MODE_11NA: - sc->sc_rates[mode] = ath_hal_getratetable(ah, HAL_MODE_11NA); + sc->sc_rates[mode] = ah->ah_getRateTable(ah, HAL_MODE_11NA); break; case IEEE80211_MODE_11NG: - sc->sc_rates[mode] = ath_hal_getratetable(ah, HAL_MODE_11NG); + sc->sc_rates[mode] = ah->ah_getRateTable(ah, HAL_MODE_11NG); break; default: return 0; diff --git a/target_firmware/wlan/if_athvar.h b/target_firmware/wlan/if_athvar.h index 304049d..90150a2 100755 --- a/target_firmware/wlan/if_athvar.h +++ b/target_firmware/wlan/if_athvar.h @@ -489,8 +489,6 @@ typedef enum { a_uint8_t ath_get_minrateidx(struct ath_softc_tgt *sc, struct ath_vap_target *avp); -#define ath_hal_getratetable(_ah, _mode) \ - ((*(_ah)->ah_getRateTable)((_ah), (_mode))) #define ath_hal_intrset(_ah, _mask) \ ((*(_ah)->ah_setInterrupts)((_ah), (_mask))) #define ath_hal_intrpend(_ah) \ -- 2.31.1