From: Oleksij Rempel Date: Sat, 11 May 2013 10:00:54 +0000 (+0200) Subject: use ah_set11nTxDesc directly X-Git-Tag: 1.4.0~12^2^2~44 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=bc2f0d1530a09de6cda35e6e02958e07d460e646;p=open-ath9k-htc-firmware.git use ah_set11nTxDesc directly Signed-off-by: Oleksij Rempel --- diff --git a/target_firmware/wlan/if_athvar.h b/target_firmware/wlan/if_athvar.h index d553189..d84176b 100755 --- a/target_firmware/wlan/if_athvar.h +++ b/target_firmware/wlan/if_athvar.h @@ -493,10 +493,6 @@ a_uint8_t ath_get_minrateidx(struct ath_softc_tgt *sc, struct ath_vap_target *av ((*(_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,\ diff --git a/target_firmware/wlan/if_owl.c b/target_firmware/wlan/if_owl.c index f5ce647..23fa9f6 100755 --- a/target_firmware/wlan/if_owl.c +++ b/target_firmware/wlan/if_owl.c @@ -263,6 +263,7 @@ static void ath_filltxdesc(struct ath_softc_tgt *sc, struct ath_tx_buf *bf) static void ath_tx_tgt_setds(struct ath_softc_tgt *sc, struct ath_tx_buf *bf) { struct ath_tx_desc *ds = bf->bf_desc; + struct ath_hal *ah = sc->sc_ah; switch (bf->bf_protmode) { case IEEE80211_PROT_RTSCTS: @@ -275,7 +276,7 @@ static void ath_tx_tgt_setds(struct ath_softc_tgt *sc, struct ath_tx_buf *bf) break; } - ath_hal_set11n_txdesc(sc->sc_ah, ds + ah->ah_set11nTxDesc(ah, ds , bf->bf_pktlen , bf->bf_atype , 60