X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fif_ath.c;h=889d1b4f29f5302a873821f2bb106a7d6386915f;hb=f8b7df1c08ced2b3bde10b48fb7970d2c8910ad1;hp=33fb7c90472f84397e78e9fab31091cf804654ac;hpb=2c9d0b027ee2170505ab4f148fcb764442c0f640;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c
index 33fb7c9..889d1b4 100755
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -50,13 +50,12 @@
 #include <adf_os_irq.h>
 
 #include <if_ath_pci.h>
-#include "if_ethersubr.h"
 #include "if_llc.h"
 #include "ieee80211_var.h"
-#include "ieee80211_proto.h"
 #include "if_athrate.h"
 #include "if_athvar.h"
 #include "ah_desc.h"
+#include "ah.h"
 
 static a_int32_t ath_numrxbufs = -1;
 static a_int32_t ath_numrxdescs = -1;
@@ -121,10 +120,10 @@ static a_int32_t ath_rate_setup(struct ath_softc_tgt *sc, a_uint32_t mode)
 
 	switch (mode) {
 	case IEEE80211_MODE_11NA:
-		sc->sc_rates[mode] = ath_hal_getratetable(ah, HAL_MODE_11NA);
+		sc->sc_rates[mode] = ah->ah_getRateTable(ah, HAL_MODE_11NA);
 		break;
 	case IEEE80211_MODE_11NG:
-		sc->sc_rates[mode] = ath_hal_getratetable(ah, HAL_MODE_11NG);
+		sc->sc_rates[mode] = ah->ah_getRateTable(ah, HAL_MODE_11NG);
 		break;
 	default:
 		return 0;
@@ -539,7 +538,7 @@ static void ath_beacon_setup(struct ath_softc_tgt *sc,
 {
 	adf_nbuf_t skb = bf->bf_skb;
 	struct ath_hal *ah = sc->sc_ah;
-	struct ath_desc *ds;
+	struct ath_tx_desc *ds;
 	a_int32_t flags;
 	const HAL_RATE_TABLE *rt;
 	a_uint8_t rix, rate;
@@ -933,7 +932,7 @@ static a_int32_t ath_desc_alloc(struct ath_softc_tgt *sc)
 
 	a_uint32_t i;
 	struct ath_descdma *dd = &sc->sc_rxdma;
-	struct ath_rx_desc *ds = dd->dd_desc;
+	struct ath_rx_desc *ds = (struct ath_rx_desc *)dd->dd_desc;
 	struct ath_rx_desc *ds_prev = NULL;
 
 	asf_tailq_init(&sc->sc_rxdesc);
@@ -1136,7 +1135,6 @@ static void ath_init_tgt(void *Context, A_UINT16 Command,
 {
 	struct ath_softc_tgt *sc = (struct ath_softc_tgt *)Context;
 	struct ath_hal *ah = sc->sc_ah;
-	a_uint32_t stbcsupport;
 
 	sc->sc_imask = HAL_INT_RX | HAL_INT_TX
 		| HAL_INT_RXEOL | HAL_INT_RXORN
@@ -1147,13 +1145,6 @@ static void ath_init_tgt(void *Context, A_UINT16 Command,
 	if (ath_hal_htsupported(ah))
 		sc->sc_imask |= HAL_INT_CST;
 
-#ifdef MAGPIE_MERLIN
-	if (ath_hal_txstbcsupport(ah, &stbcsupport))
-		sc->sc_txstbcsupport = stbcsupport;
-
-	if (ath_hal_rxstbcsupport(ah, &stbcsupport))
-		sc->sc_rxstbcsupport = stbcsupport;
-#endif
 	adf_os_setup_intr(sc->sc_dev, ath_intr);
 	ath_hal_intrset(ah, sc->sc_imask);
 
@@ -1883,8 +1874,7 @@ static void tgt_hif_htc_wmi_init(struct ath_softc_tgt *sc)
 	HTC_Ready(sc->tgt_htc_handle);
 }
 
-a_int32_t ath_tgt_attach(a_uint32_t devid,a_uint32_t mem_start,
-			 struct ath_softc_tgt *sc, adf_os_device_t osdev)
+a_int32_t ath_tgt_attach(a_uint32_t devid, struct ath_softc_tgt *sc, adf_os_device_t osdev)
 {
 	struct ath_hal *ah;
 	HAL_STATUS status;