From: Oleksij Rempel <linux@rempel-privat.de>
Date: Sat, 11 May 2013 10:51:12 +0000 (+0200)
Subject: use ah_setupTxDesc directly
X-Git-Tag: 1.4.0~12^2^2~34
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=840acf98145130f2d6ce939fe4724d49b390e69c;p=open-ath9k-htc-firmware.git

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 6186f67..9f1e172 100755
--- 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 07ceac3..a641fde 100755
--- 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 0793c41..f8cfd64 100755
--- 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