use ah_setupTxDesc 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 d553189f5de2e59ca83833b4b561398a65583567..a641fde268c84344171309d4effa777c7fb49219 100755 (executable)
--- a/target_firmware/wlan/if_athvar.h
+++ b/target_firmware/wlan/if_athvar.h
@@ -489,32 +489,8 @@ typedef enum {
 
 a_uint8_t ath_get_minrateidx(struct ath_softc_tgt *sc, struct ath_vap_target *avp);
 
-#define ath_hal_setuprxdesc(_ah, _ds, _size, _intreq) \
-    ((*(_ah)->ah_setupRxDesc)((_ah), (_ds), (_size), (_intreq)))
-#define ath_hal_rxprocdescfast(_ah, _ds, _dspa, _dsnext, _rx_stats) \
-    ((*(_ah)->ah_procRxDescFast)((_ah), (_ds), (_dspa), (_dsnext), (_rx_stats)))
-#define ath_hal_set11n_txdesc(_ah, _ds, _pktlen, _type, _txpower,\
-                            _keyix, _keytype, _flags) \
-    ((*(_ah)->ah_set11nTxDesc)(_ah, _ds, _pktlen, _type, _txpower, _keyix,\
-                              _keytype, _flags))
-#define ath_hal_set11n_ratescenario(_ah, _ds, _durupdate, _rtsctsrate, _rtsctsduration, \
-                                   _series, _nseries, _flags)         \
-    ((*(_ah)->ah_set11nRateScenario)(_ah, _ds, _durupdate, _rtsctsrate, _rtsctsduration,\
-                                    _series, _nseries, _flags))
-#define ath_hal_clr11n_aggr(_ah, _ds) \
-    ((*(_ah)->ah_clr11nAggr)(_ah, _ds))
-#define ath_hal_set11n_burstduration(_ah, _ds, _burstduration) \
-    ((*(_ah)->ah_set11nBurstDuration)(_ah, _ds, _burstduration))
 #define ath_hal_set11n_virtualmorefrag(_ah, _ds, _vmf) \
     ((*(_ah)->ah_set11nVirtualMoreFrag)(_ah, _ds, _vmf))
-#define ath_hal_setuptxdesc(_ah, _ds, _plen, _hlen, _atype, _txpow, \
-       _txr0, _txtr0, _keyix, _ant, _flags, \
-       _rtsrate, _rtsdura, \
-       _compicvlen, _compivlen, _comp) \
-    ((*(_ah)->ah_setupTxDesc)((_ah), (_ds), (_plen), (_hlen), (_atype), \
-       (_txpow), (_txr0), (_txtr0), (_keyix), (_ant), \
-       (_flags), (_rtsrate), (_rtsdura), \
-       (_compicvlen), (_compivlen), (_comp)))
 #define ath_hal_fillkeytxdesc(_ah, _ds, _keytype) \
     ((*(_ah)->ah_fillKeyTxDesc)((_ah), (_ds), (_keytype)))
 #define ath_hal_filltxdesc(_ah, _ds, _l, _first, _last, _ds0) \
@@ -525,11 +501,5 @@ 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) \
-    ((*(_ah)->ah_set11nAggrLast)(_ah, _ds))
 
 #endif /* _DEV_ATH_ATHVAR_H */