From: Oleksij Rempel <linux@rempel-privat.de>
Date: Sat, 11 May 2013 11:03:20 +0000 (+0200)
Subject: use ah_set11nVirtualMoreFrag directly
X-Git-Tag: 1.4.0~12^2^2~29
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8c18f096473720783f898f1ada3c4ee880ee1775;p=librecmc%2Fopen-ath9k-htc-firmware.git

use ah_set11nVirtualMoreFrag 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 c378b58..f6f67cb 100755
--- a/target_firmware/wlan/if_athvar.h
+++ b/target_firmware/wlan/if_athvar.h
@@ -489,8 +489,6 @@ typedef enum {
 
 a_uint8_t ath_get_minrateidx(struct ath_softc_tgt *sc, struct ath_vap_target *avp);
 
-#define ath_hal_set11n_virtualmorefrag(_ah, _ds, _vmf) \
-    ((*(_ah)->ah_set11nVirtualMoreFrag)(_ah, _ds, _vmf))
 #define ath_hal_htsupported(_ah) \
     (ath_hal_getcapability(_ah, HAL_CAP_HT, 0, NULL) == HAL_OK)
 #define ath_hal_getrtsaggrlimit(_ah, _pv) \
diff --git a/target_firmware/wlan/if_owl.c b/target_firmware/wlan/if_owl.c
index 00a9129..19a945c 100755
--- a/target_firmware/wlan/if_owl.c
+++ b/target_firmware/wlan/if_owl.c
@@ -990,7 +990,7 @@ ath_tx_freebuf(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
 	for (bfd = bf->bf_desc, i = 0; i < bf->bf_dmamap_info.nsegs; bfd++, i++) {
 		ah->ah_clr11nAggr(ah, bfd);
 		ah->ah_set11nBurstDuration(ah, bfd, 0);
-		ath_hal_set11n_virtualmorefrag(sc->sc_ah, bfd, 0);
+		ah->ah_set11nVirtualMoreFrag(ah, bfd, 0);
 	}
 
 	ath_dma_unmap(sc, bf);
@@ -1814,7 +1814,7 @@ ath_tx_retry_subframe(struct ath_softc_tgt *sc, struct ath_tx_buf *bf,
 	for(ds = bf->bf_desc, i = 0; i < bf->bf_dmamap_info.nsegs; ds++, i++) {
 		ah->ah_clr11nAggr(ah, ds);
 		ah->ah_set11nBurstDuration(ah, ds, 0);
-		ath_hal_set11n_virtualmorefrag(sc->sc_ah, ds, 0);
+		ah->ah_set11nVirtualMoreFrag(ah, ds, 0);
 	}
 
 	if (bf->bf_retries >= OWLMAX_RETRIES) {