use ah_fillTxDesc 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 9f1e1722084e724aa536e1798b43f0baadd65d45..59b6c94024c96f42dcfe3e7065c50b36c4f0499b 100755 (executable)
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -570,7 +570,7 @@ static void ath_beacon_setup(struct ath_softc_tgt *sc,
                            , 0
                            , ATH_COMP_PROC_NO_COMP_NO_CCS);
 
-       ath_hal_filltxdesc(ah, ds
+       ah->ah_fillTxDesc(ah, ds
                           , asf_roundup(adf_nbuf_len(skb), 4)
                           , AH_TRUE
                           , AH_TRUE

diff --git a/target_firmware/wlan/if_athvar.h b/target_firmware/wlan/if_athvar.h
index a641fde268c84344171309d4effa777c7fb49219..edcf74ced4a18ad3bab483f58658722defccefdc 100755 (executable)
--- a/target_firmware/wlan/if_athvar.h
+++ b/target_firmware/wlan/if_athvar.h
@@ -493,8 +493,6 @@ a_uint8_t ath_get_minrateidx(struct ath_softc_tgt *sc, struct ath_vap_target *av
     ((*(_ah)->ah_set11nVirtualMoreFrag)(_ah, _ds, _vmf))
 #define ath_hal_fillkeytxdesc(_ah, _ds, _keytype) \
     ((*(_ah)->ah_fillKeyTxDesc)((_ah), (_ds), (_keytype)))
-#define ath_hal_filltxdesc(_ah, _ds, _l, _first, _last, _ds0) \
-    ((*(_ah)->ah_fillTxDesc)((_ah), (_ds), (_l), (_first), (_last), (_ds0)))
 #define ath_hal_txprocdesc(_ah, _ds) \
     ((*(_ah)->ah_procTxDesc)((_ah), (_ds)))
 #define ath_hal_htsupported(_ah) \

diff --git a/target_firmware/wlan/if_owl.c b/target_firmware/wlan/if_owl.c
index f8cfd6448480ad71cd0401d6b176460c1db6cceb..31a4ab4ebcaa87b5b9e84eade8a9a4fbbe314bf0 100755 (executable)
--- a/target_firmware/wlan/if_owl.c
+++ b/target_firmware/wlan/if_owl.c
@@ -237,6 +237,7 @@ static void ath_dma_unmap(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
 static void ath_filltxdesc(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
 {
        struct ath_tx_desc *ds0, *ds = bf->bf_desc;
+       struct ath_hal *ah = sc->sc_ah;
        a_uint8_t i;
 
        ds0 = ds;
@@ -252,7 +253,7 @@ static void ath_filltxdesc(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
                } else
                        ds->ds_link = ATH_BUF_GET_DESC_PHY_ADDR_WITH_IDX(bf, i+1);
 
-               ath_hal_filltxdesc(sc->sc_ah, ds
+               ah->ah_fillTxDesc(ah, ds
                                   , bf->bf_dmamap_info.dma_segs[i].len
                                   , i == 0
                                   , i == (bf->bf_dmamap_info.nsegs - 1)