carl9170 firmware: integrate TX_AMPDU & DELAYED_TX

[carl9170fw.git] / carlfw / Kconfig

diff --git a/carlfw/Kconfig b/carlfw/Kconfig
index 9a980e36268ad211186ed0e7c28597e3d1f1823b..1c5718ae60caa986ce1107e07043814dce4ced12 100644 (file)
--- a/carlfw/Kconfig
+++ b/carlfw/Kconfig
@@ -1,13 +1,7 @@
 menu "General"
 
-config CARL9170FW_MAKE_RELEASE
-       def_bool y
-       prompt "Update/Generate new release/revision files"
-
 config CARL9170FW_RELEASE_VERSION
        int
-       depends on CARL9170FW_MAKE_RELEASE
-       prompt "Major CARL9170 Firmware Revision"
        default 1
 
 menu "Selectable Hardware Options"
@@ -139,32 +133,40 @@ config CARL9170FW_PSM
         Firmware will automatically turn it on again, when the
         PRETBTT event fires.
 
-config CARL9170FW_DELAYED_TX
+config CARL9170FW_WOL_OPTION
        def_bool n
-       prompt "Delay and reorder TX"
+       prompt "Wakeup on WLAN"
        depends on CARL9170FW_EXPERIMENTAL
        ---help---
-        Delay incoming TX' from the application until wlan_complete
-        has finished.
-
-        This feature is necessary to keep A-MPDUs partially ordered.
+        With this option enabled, the firmware can wake-up
+        suspended hosts... As long as they fully support
+        USB remote wakeup.
 
-        Doesn't work 100% yet, but in most cases other HW designs can
-        deal with the fallout.
+config CARL9170FW_WOL
+       def_bool n
+       depends on CARL9170FW_WOL_OPTION
 
-config CARL9170FW_TX_AMPDU
+config CARL9170FW_WOL_MAGIC_PACKET
        def_bool n
-       prompt "Firmware-supported ampdu scheduling"
-       depends on CARL9170FW_EXPERIMENTAL
+       prompt "Magic Packet(tm)"
+       depends on CARL9170FW_WOL_OPTION
+       select CARL9170FW_WOL
+       ---help---
+        Sniff all incoming data frames for the magic packet pattern.
 
-config CARL9170FW_WOL
+config CARL9170FW_WOL_PROBE_REQUEST
        def_bool n
-       prompt "Wakeup on WLAN"
-       depends on CARL9170FW_EXPERIMENTAL
+       prompt "Probe Request"
+       depends on CARL9170FW_WOL_OPTION
+       select CARL9170FW_WOL
        ---help---
-        With this option enabled, the firmware can wake-up
-        suspended hosts... As long as they fully support
-        USB remote wakeup.
+        Scan probe requests for a given SSID.
+
+config CARL9170FW_WOL_PROBE_REQUEST_SSID
+       string
+       prompt "Wakeup on WLAN SSID"
+       default "CARL9170_WAKEUP"
+       depends on CARL9170FW_WOL_PROBE_REQUEST
 
 config CARL9170FW_VIFS_NUM
        default 1