use ah_set11nTxDesc directly

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>

diff --git a/target_firmware/wlan/if_athvar.h b/target_firmware/wlan/if_athvar.h
index d553189f5de2e59ca83833b4b561398a65583567..d84176bfab2f4e14db2b67de0de657dd3c22f7dd 100755 (executable)
--- 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 f5ce647f453207eee1a8dc08f717f49f4bc9c517..23fa9f6da3ad831b37ecf0496caaf547da4cad13 100755 (executable)
--- 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