X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Fwlan.c;h=59e9141feeccdb9d107a8bde210cc1b968a87710;hb=67460e54bedffbc62589ab4d5742e85091107b87;hp=6c73b4840f5649c7b0cbb6a1597f4df8257c3ce3;hpb=af915846d44d23adc02c7ded807282d607b46faa;p=carl9170fw.git

diff --git a/carlfw/src/wlan.c b/carlfw/src/wlan.c
index 6c73b48..59e9141 100644
--- 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");
@@ -756,7 +756,7 @@ static void wlan_wol_connection_monitor(void)
 	if (!fw.wlan.fw_desc_available)
 		return;
 
-	memset(nullf, 0, sizeof(nullf));
+	memset(nullf, 0, sizeof(*nullf));
 
 	nullf->s.len = sizeof(struct carl9170_tx_superdesc) +
 		     sizeof(struct ar9170_tx_hwdesc) +
@@ -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])) {