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

use ah_set11nRateScenario 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 9d0f8d4..41ba354 100755
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -580,7 +580,7 @@ static void ath_beacon_setup(struct ath_softc_tgt *sc,
 	series[0].Rate = rate;
 	series[0].ChSel = sc->sc_ic.ic_tx_chainmask;
 	series[0].RateFlags = 0;
-	ath_hal_set11n_ratescenario(ah, ds, 0, 0, 0, series, 4, 0);
+	ah->ah_set11nRateScenario(ah, ds, 0, 0, 0, series, 4, 0);
 }
 
 static void ath_tgt_send_beacon(struct ath_softc_tgt *sc, adf_nbuf_t bc_hdr,
diff --git a/target_firmware/wlan/if_athvar.h b/target_firmware/wlan/if_athvar.h
index d84176b..b69817c 100755
--- 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_ratescenario(_ah, _ds, _durupdate, _rtsctsrate, _rtsctsduration, \
-				    _series, _nseries, _flags)         \
-    ((*(_ah)->ah_set11nRateScenario)(_ah, _ds, _durupdate, _rtsctsrate, _rtsctsduration,\
-				     _series, _nseries, _flags))
 #define ath_hal_clr11n_aggr(_ah, _ds) \
     ((*(_ah)->ah_clr11nAggr)(_ah, _ds))
 #define ath_hal_set11n_burstduration(_ah, _ds, _burstduration) \
diff --git a/target_firmware/wlan/if_owl.c b/target_firmware/wlan/if_owl.c
index 23fa9f6..657c89b 100755
--- a/target_firmware/wlan/if_owl.c
+++ b/target_firmware/wlan/if_owl.c
@@ -443,7 +443,7 @@ static void ath_buf_set_rate(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
     rtsctsrate = rt->info[cix].rateCode |
 	    (bf->bf_shpream ? rt->info[cix].shortPreamble : 0);
 
-    ath_hal_set11n_ratescenario(ah, ds, 1,
+    ah->ah_set11nRateScenario(ah, ds, 1,
 				rtsctsrate, ctsduration,
 				series, 4,
 				flags);
@@ -1231,7 +1231,7 @@ ath_tgt_send_mgt(struct ath_softc_tgt *sc,adf_nbuf_t hdr_buf, adf_nbuf_t skb,
 		series[i].ChSel = sc->sc_ic.ic_tx_chainmask;
 		series[i].RateFlags = 0;
 	}
-	ath_hal_set11n_ratescenario(ah, ds, 0, ctsrate, ctsduration, series, 4, 0);
+	ah->ah_set11nRateScenario(ah, ds, 0, ctsrate, ctsduration, series, 4, 0);
 	ath_tgt_txqaddbuf(sc, txq, bf, bf->bf_lastds);
 
 	return;
@@ -2081,6 +2081,7 @@ static void ath_bar_tx(struct ath_softc_tgt *sc,
 	struct ieee80211_frame_bar *bar;
 	u_int8_t min_rate;
 	struct ath_tx_desc *ds, *ds0;
+	struct ath_hal *ah = sc->sc_ah;
 	HAL_11N_RATE_SERIES series[4];
 	int i = 0;
 	adf_nbuf_queue_t skbhead;
@@ -2152,6 +2153,6 @@ static void ath_bar_tx(struct ath_softc_tgt *sc,
 		series[i].ChSel = sc->sc_ic.ic_tx_chainmask;
 	}
 
-	ath_hal_set11n_ratescenario(sc->sc_ah, bf->bf_desc, 0, 0, 0, series, 4, 4);
+	ah->ah_set11nRateScenario(ah, bf->bf_desc, 0, 0, 0, series, 4, 4);
 	ath_tgt_txq_add_ucast(sc, bf);
 }