carl9170 firmware: get rid of nested wlan_tx calls

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

diff --git a/carlfw/src/fw.c b/carlfw/src/fw.c
index 00bf940a5b9494c3ce73b31b6d0d9754b6df00d4..fde4a5d4a3263f33a9408080f43c29d5324ee245 100644 (file)
--- a/carlfw/src/fw.c
+++ b/carlfw/src/fw.c
@@ -37,15 +37,14 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
                                        BIT(CARL9170FW_USB_RESP_EP2) |
                                        BIT(CARL9170FW_HANDLE_BACK_REQ) |
                                        BIT(CARL9170FW_RX_FILTER) |
-#ifdef CONFIG_CARL9170FW_USB_INIT_FIRMWARE
+                                       BIT(CARL9170FW_HW_COUNTERS) |
                                        BIT(CARL9170FW_USB_INIT_FIRMWARE) |
-# ifdef CONFIG_CARL9170FW_USB_UP_STREAM
+#ifdef CONFIG_CARL9170FW_USB_UP_STREAM
                                        BIT(CARL9170FW_USB_UP_STREAM) |
-# endif /* CONFIG_CARL9170FW_USB_UP_STREAM */
-# ifdef CONFIG_CARL9170FW_USB_DOWN_STREAM
+#endif /* CONFIG_CARL9170FW_USB_UP_STREAM */
+#ifdef CONFIG_CARL9170FW_USB_DOWN_STREAM
                                        BIT(CARL9170FW_USB_DOWN_STREAM) |
-# endif /* CONFIG_CARL9170FW_USB_DOWN_STREAM */
-#endif /* CONFIG_CARL9170FW_USB_INIT_FIRMWARE */
+#endif /* CONFIG_CARL9170FW_USB_DOWN_STREAM */
 #ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
                                        BIT(CARL9170FW_COMMAND_PHY) |
                                        BIT(CARL9170FW_PSM) |
@@ -103,8 +102,8 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
        FILL(dbg, DBG,
             .bogoclock_addr = cpu_to_le32(0),
             .counter_addr = cpu_to_le32(&fw.counter),
-            .rx_total_addr = cpu_to_le32(&fw.wlan.rx_total),
-            .rx_overrun_addr = cpu_to_le32(&fw.wlan.rx_overruns),
+            .rx_total_addr = cpu_to_le32(0),
+            .rx_overrun_addr = cpu_to_le32(0),
             .rx_filter = cpu_to_le32(&fw.wlan.rx_filter),
        ),