use ah_setupTxDesc directly

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

diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c
index 6186f670f0f77de6407fb393fbcc91419587513d..9f1e1722084e724aa536e1798b43f0baadd65d45 100755 (executable)
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -555,7 +555,7 @@ static void ath_beacon_setup(struct ath_softc_tgt *sc,
        rt  = sc->sc_currates;
        rate = rt->info[rix].rateCode;
 
-       ath_hal_setuptxdesc(ah, ds
+       ah->ah_setupTxDesc(ah, ds
                            , adf_nbuf_len(skb) + IEEE80211_CRC_LEN
                            , sizeof(struct ieee80211_frame)
                            , HAL_PKT_TYPE_BEACON

diff --git a/target_firmware/wlan/if_athvar.h b/target_firmware/wlan/if_athvar.h
index 07ceac39784d96acf7e1c46c186cf423ad084ef0..a641fde268c84344171309d4effa777c7fb49219 100755 (executable)
--- a/target_firmware/wlan/if_athvar.h
+++ b/target_firmware/wlan/if_athvar.h
@@ -491,14 +491,6 @@ a_uint8_t ath_get_minrateidx(struct ath_softc_tgt *sc, struct ath_vap_target *av
 
 #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) \

diff --git a/target_firmware/wlan/if_owl.c b/target_firmware/wlan/if_owl.c
index 0793c41472a49a45b4371a7b5c9025d64824c9ed..f8cfd6448480ad71cd0401d6b176460c1db6cceb 100755 (executable)
--- a/target_firmware/wlan/if_owl.c
+++ b/target_firmware/wlan/if_owl.c
@@ -1199,7 +1199,7 @@ ath_tgt_send_mgt(struct ath_softc_tgt *sc,adf_nbuf_t hdr_buf, adf_nbuf_t skb,
 
        flags |= HAL_TXDESC_INTREQ;
 
-       ath_hal_setuptxdesc(ah, ds
+       ah->ah_setupTxDesc(ah, ds
                            , pktlen
                            , hdrlen
                            , atype
@@ -2127,7 +2127,7 @@ static void ath_bar_tx(struct ath_softc_tgt *sc,
        adf_nbuf_dmamap_info(bf->bf_dmamap, &bf->bf_dmamap_info);
 
        ds = bf->bf_desc;
-       ath_hal_setuptxdesc(sc->sc_ah, ds
+       ah->ah_setupTxDesc(ah, ds
                            , adf_nbuf_len(skb) + IEEE80211_CRC_LEN
                            , 0
                            , HAL_PKT_TYPE_NORMAL