X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fif_ath.c;h=b787a8439181c9c6f77a878abaef5d0cb3ed1cbf;hb=f78b39dc858d76a626cc76a9f348a14fde19e9ce;hp=90813fb67efdfd15f135aa289c9c5c0d3aa7bea3;hpb=9c1255ab4a62763f80a636548b5f5c54be272118;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c
index 90813fb..b787a84 100755
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -539,7 +539,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;
@@ -879,8 +879,8 @@ static void ath_descdma_cleanup(struct ath_softc_tgt *sc,
 				struct ath_descdma *dd,
 				ath_bufhead *head, a_int32_t dir)
 {
-	struct ath_tx_buf *bf;
-	struct ieee80211_node *ni;
+	struct ath_buf *bf;
+	struct ieee80211_node_target *ni;
 
 	asf_tailq_foreach(bf, head, bf_list) {
 		if (adf_nbuf_queue_len(&bf->bf_skbhead) != 0) {
@@ -924,7 +924,7 @@ static a_int32_t ath_desc_alloc(struct ath_softc_tgt *sc)
 	if (ath_numrxdescs == -1)
 		ath_numrxdescs = ATH_RXDESC;
 
-	error = ath_descdma_setup(sc, &sc->sc_rxdma, &sc->sc_rxbuf,
+	error = ath_descdma_setup(sc, &sc->sc_rxdma, (ath_bufhead *)&sc->sc_rxbuf,
 				  "rx", ath_numrxdescs, 1,
 				  sizeof(struct ath_rx_buf),
 				  sizeof(struct ath_rx_desc));
@@ -961,24 +961,24 @@ static a_int32_t ath_desc_alloc(struct ath_softc_tgt *sc)
 		asf_tailq_insert_tail(&sc->sc_rxdesc, ds, ds_list);
 	}
 
-	error = ath_descdma_setup(sc, &sc->sc_txdma, &sc->sc_txbuf,
+	error = ath_descdma_setup(sc, &sc->sc_txdma, (ath_bufhead *)&sc->sc_txbuf,
 				  "tx", ATH_TXBUF + 1, ATH_TXDESC,
 				  sizeof(struct ath_tx_buf),
 				  sizeof(struct ath_tx_desc));
 	if (error != 0) {
-		ath_descdma_cleanup(sc, &sc->sc_rxdma, &sc->sc_rxbuf,
+		ath_descdma_cleanup(sc, &sc->sc_rxdma, (ath_bufhead *)&sc->sc_rxbuf,
 				    ADF_OS_DMA_FROM_DEVICE);
 		return error;
 	}
 
-	error = ath_descdma_setup(sc, &sc->sc_bdma, &sc->sc_bbuf,
+	error = ath_descdma_setup(sc, &sc->sc_bdma, (ath_bufhead *)&sc->sc_bbuf,
 				  "beacon", ATH_BCBUF, 1,
 				  sizeof(struct ath_tx_buf),
 				  sizeof(struct ath_tx_desc));
 	if (error != 0) {
-		ath_descdma_cleanup(sc, &sc->sc_txdma, &sc->sc_txbuf,
+		ath_descdma_cleanup(sc, &sc->sc_txdma, (ath_bufhead *)&sc->sc_txbuf,
 				    ADF_OS_DMA_TO_DEVICE);
-		ath_descdma_cleanup(sc, &sc->sc_rxdma, &sc->sc_rxbuf,
+		ath_descdma_cleanup(sc, &sc->sc_rxdma, (ath_bufhead *)&sc->sc_rxbuf,
 				    ADF_OS_DMA_FROM_DEVICE);
 		return error;
 	}
@@ -1001,10 +1001,10 @@ static void ath_desc_free(struct ath_softc_tgt *sc)
 	sc->sc_txbuf_held = NULL;
 
 	if (sc->sc_txdma.dd_desc_len != 0)
-		ath_descdma_cleanup(sc, &sc->sc_txdma, &sc->sc_txbuf,
+		ath_descdma_cleanup(sc, &sc->sc_txdma, (ath_bufhead *)&sc->sc_txbuf,
 				    ADF_OS_DMA_TO_DEVICE);
 	if (sc->sc_rxdma.dd_desc_len != 0)
-		ath_descdma_cleanup(sc, &sc->sc_rxdma, &sc->sc_rxbuf,
+		ath_descdma_cleanup(sc, &sc->sc_rxdma, (ath_bufhead *)&sc->sc_rxbuf,
 				    ADF_OS_DMA_FROM_DEVICE);
 }
 
@@ -1532,7 +1532,7 @@ static void ath_flushrecv_tgt(void *Context, A_UINT16 Command,
 			      A_UINT16 SeqNo, A_UINT8 *data, a_int32_t datalen)
 {
 	struct ath_softc_tgt *sc = (struct ath_softc_tgt *)Context;
-	struct ath_buf *bf;
+	struct ath_rx_buf *bf;
 
 	asf_tailq_foreach(bf, &sc->sc_rxbuf, bf_list)
 		if (bf->bf_skb != NULL) {
@@ -1883,8 +1883,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;
@@ -1906,7 +1905,7 @@ a_int32_t ath_tgt_attach(a_uint32_t devid,a_uint32_t mem_start,
 	ATH_INIT_TQUEUE(sc->sc_dev, &sc->sc_fataltq, ath_fatal_tasklet, sc);
 
 	flags |= AH_USE_EEPROM;
-	ah = _ath_hal_attach_tgt(devid,sc,sc->sc_dev,mem_start, flags, &status);
+	ah = _ath_hal_attach_tgt(devid, sc, sc->sc_dev, flags, &status);
 	if (ah == NULL) {
 		error = ENXIO;
 		goto bad;