use ah_getRateTable directly

[open-ath9k-htc-firmware.git] / target_firmware / wlan / if_athvar.h

diff --git a/target_firmware/wlan/if_athvar.h b/target_firmware/wlan/if_athvar.h
index 8330b9460af2061db9049cda721ff7bb04c83a0d..90150a28bb5c9b3b014095f701e28ccfac750c68 100755 (executable)
--- a/target_firmware/wlan/if_athvar.h
+++ b/target_firmware/wlan/if_athvar.h
@@ -321,7 +321,7 @@ struct wmi_rc_rate_mask_cmd {
 struct ath_vap_target {
        struct ieee80211vap_target      av_vap;
        struct ath_txq                  av_mcastq;
-       struct ath_buf                  *av_bcbuf;
+       struct ath_tx_buf               *av_bcbuf;
        a_uint32_t                      av_rate_mask[2];  /* 0 - 2G, 1 - 5G */
        a_uint8_t                       av_minrateidx[2]; /* 0 - 2G, 1 - 5G */
        a_int8_t                        av_valid;
@@ -366,8 +366,6 @@ struct ath_softc_tgt
        struct ath_ratectrl    *sc_rc;
 
        a_uint32_t            sc_invalid : 1,
-               sc_txstbcsupport       : 1,
-               sc_rxstbcsupport       : 2,
                sc_tx_draining         : 1,
                sc_enable_coex         : 1;
 
@@ -420,7 +418,7 @@ struct ath_softc_tgt
        struct ath_vap_target      sc_vap[TARGET_VAP_MAX];
        struct ieee80211com_target sc_ic;
 
-       ath_bufhead         sc_bbuf;
+       ath_tx_bufhead         sc_bbuf;
        a_uint64_t          sc_swba_tsf;
 
        WMI_TXSTATUS_EVENT  tx_status[2];
@@ -491,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) \
@@ -547,10 +543,6 @@ a_uint8_t ath_get_minrateidx(struct ath_softc_tgt *sc, struct ath_vap_target *av
     ((*(_ah)->ah_stopPcuReceive)((_ah)))
 #define ath_hal_htsupported(_ah) \
     (ath_hal_getcapability(_ah, HAL_CAP_HT, 0, NULL) == HAL_OK)
-#define ath_hal_rxstbcsupport(_ah, _rxstbc) \
-    (ath_hal_getcapability(_ah, HAL_CAP_RX_STBC, 0, _rxstbc) == HAL_OK)
-#define ath_hal_txstbcsupport(_ah, _txstbc) \
-    (ath_hal_getcapability(_ah, HAL_CAP_TX_STBC, 0, _txstbc) == HAL_OK)
 #define ath_hal_getrtsaggrlimit(_ah, _pv) \
     (ath_hal_getcapability(_ah, HAL_CAP_RTS_AGGR_LIMIT, 0, _pv) == HAL_OK)
 #define ath_hal_puttxbuf(_ah, _q, _bufaddr) \
@@ -563,8 +555,6 @@ a_uint8_t ath_get_minrateidx(struct ath_softc_tgt *sc, struct ath_vap_target *av
     ((*(_ah)->ah_getTsf64)((_ah)))
 #define ath_hal_intrset(_ah, _mask) \
     ((*(_ah)->ah_setInterrupts)((_ah), (_mask)))
-#define ath_hal_getcapability(_ah, _cap, _param, _result) \
-    ((*(_ah)->ah_getCapability)((_ah), (_cap), (_param), (_result)))
 #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) \