carl9170 firmware: report device tallies

[carl9170fw.git] / carlfw / src / wlan.c

diff --git a/carlfw/src/wlan.c b/carlfw/src/wlan.c
index 6c73b4840f5649c7b0cbb6a1597f4df8257c3ce3..7567312251f8896f71dac95bfd7947a046273dab 100644 (file)
--- a/carlfw/src/wlan.c
+++ b/carlfw/src/wlan.c
@@ -644,8 +644,8 @@ static void wlan_check_rx_overrun(void)
 {
        uint32_t overruns, total;
 
-       fw.wlan.rx_total += total = get(AR9170_MAC_REG_RX_TOTAL);
-       fw.wlan.rx_overruns += overruns = get(AR9170_MAC_REG_RX_OVERRUN);
+       fw.tally.rx_total += total = get(AR9170_MAC_REG_RX_TOTAL);
+       fw.tally.rx_overrun += overruns = get(AR9170_MAC_REG_RX_OVERRUN);
        if (unlikely(overruns)) {
                if (overruns == total) {
                        DBG("RX Overrun");
@@ -1120,10 +1120,12 @@ static void handle_pretbtt(void)
        fw.wlan.cab_flush_time = get_clock_counter();
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
+#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
        rf_psm();
 
        send_cmd_to_host(4, CARL9170_RSP_PRETBTT, 0x00,
                         (uint8_t *) &fw.phy.psm.state);
+#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
 }
 
 static void handle_atim(void)
@@ -1223,7 +1225,7 @@ static void wlan_check_hang(void)
                }
 
                /* fetch the current DMA queue position */
-               desc = get_wlan_txq_addr(i);
+               desc = (struct dma_desc *)get_wlan_txq_addr(i);
 
                /* Stuck frame detection */
                if (unlikely(DESC_PAYLOAD(desc) == fw.wlan.last_super[i])) {