Merge pull request #120 from olerem/warnings-2016.12.16

[open-ath9k-htc-firmware.git] / target_firmware / wlan / if_ath.c

diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c
index cf92262b10210ef2645b8e716d7ef65331e0877d..f8dee47b87439700dfab9150ae3a6c0e884170cb 100755 (executable)
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -583,7 +583,7 @@ static void ath_tgt_send_beacon(struct ath_softc_tgt *sc, adf_nbuf_t bc_hdr,
        struct ath_hal *ah = sc->sc_ah;
        struct ath_tx_buf *bf;
        a_uint8_t vap_index, *anbdata;
-       ath_beacon_hdr_t *bhdr;
+       ath_beacon_hdr_t *bhdr = NULL;
        a_uint32_t anblen;
 
        if (!bc_hdr) {
@@ -591,6 +591,7 @@ static void ath_tgt_send_beacon(struct ath_softc_tgt *sc, adf_nbuf_t bc_hdr,
                bhdr = (ath_beacon_hdr_t *)anbdata;
        } else {
                adf_os_print("found bc_hdr! 0x%x\n", bc_hdr);
+               adf_os_assert(0);
        }
 
        vap_index = bhdr->vap_index;
@@ -1614,11 +1615,14 @@ static void ath_stop_tx_dma_tgt(void *Context, A_UINT16 Command,
        struct ath_hal *ah = sc->sc_ah;
        a_uint32_t q;
 
-       if (data)
-               q = *(a_uint32_t *)data;
+       if (!datalen)
+               goto done;
+
+       q = *(a_uint32_t *)data;
 
        q = adf_os_ntohl(q);
        ah->ah_stopTxDma(ah, q);
+done:
        wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);
 }