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

diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c
index b787a84..b8874bf 100755
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -933,7 +933,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 +1136,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
@@ -1148,11 +1147,14 @@ static void ath_init_tgt(void *Context, A_UINT16 Command,
 		sc->sc_imask |= HAL_INT_CST;
 
 #ifdef MAGPIE_MERLIN
-	if (ath_hal_txstbcsupport(ah, &stbcsupport))
-		sc->sc_txstbcsupport = stbcsupport;
+	{
+		a_uint32_t stbcsupport;
+		if (ath_hal_txstbcsupport(ah, &stbcsupport))
+			sc->sc_txstbcsupport = stbcsupport;
 
-	if (ath_hal_rxstbcsupport(ah, &stbcsupport))
-		sc->sc_rxstbcsupport = 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);