carl9170 firmware: per-vif tx sequence counter

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

diff --git a/carlfw/src/fw.c b/carlfw/src/fw.c
index fe59db56c6a148c701ee842164560f63b62e1c22..1af4d90f595c3b445adf9cc64afd22d010aedf0c 100644 (file)
--- a/carlfw/src/fw.c
+++ b/carlfw/src/fw.c
@@ -44,9 +44,6 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
                                        BIT(CARL9170FW_USB_DOWN_STREAM) |
 # endif /* CONFIG_CARL9170FW_USB_DOWN_STREAM */
 #endif /* CONFIG_CARL9170FW_USB_INIT_FIRMWARE */
-#ifdef CONFIG_CARL9170FW_USB_WATCHDOG
-                                       BIT(CARL9170FW_USB_WATCHDOG) |
-#endif /* CONFIG_CARL9170FW_USB_WATCHDOG */
 #ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
                                        BIT(CARL9170FW_COMMAND_PHY) |
 #endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
@@ -67,7 +64,11 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
 #endif /* CONFIG_CARL9170FW_GPIO_INTERRUPT */
 #ifdef CONFIG_CARL9170FW_PSM
                                        BIT(CARL9170FW_PSM) |
-#endif
+#endif /* CONFIG_CARL9170FW_PSM */
+                                       BIT(CARL9170FW_RX_FILTER) |
+#ifdef CONFIG_CARL9170FW_WOL
+                                       BIT(CARL9170FW_WOL) |
+#endif /* CONFIG_CARL9170FW_WOL */
                                           (0)),
 
             .miniboot_size = cpu_to_le16(0),
@@ -82,6 +83,10 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
             .api_ver = CONFIG_CARL9170FW_RELEASE_VERSION,
        ),
 
+       FILL(txsq, TXSQ,
+            .seq_table_addr = cpu_to_le32(&fw.wlan.sequence),
+       ),
+
        FILL(motd, MOTD,
             .fw_year_month_day = cpu_to_le32(
                        CARL9170FW_SET_DAY(CARL9170FW_VERSION_DAY) +
@@ -91,10 +96,11 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
             .release = CARL9170FW_VERSION_GIT),
 
        FILL(dbg, DBG,
-            .bogoclock_addr = cpu_to_le32(&fw.bogoclock),
+            .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_filter = cpu_to_le32(&fw.wlan.rx_filter),
        ),
 
        FILL(last, LAST),