Merge branch 'master' into radar

[carl9170fw.git] / carlfw / Kconfig

diff --git a/carlfw/Kconfig b/carlfw/Kconfig
index 68e7773656e3ef0815733ba29bec225be1bb49f3..c2da51a0820ec4997a3fa57384747a53b869f5a8 100644 (file)
--- a/carlfw/Kconfig
+++ b/carlfw/Kconfig
@@ -67,20 +67,6 @@ endmenu
 
 menu "802.11 Firmware Features"
 
-config CARL9170FW_HANDLE_BACK_REQ
-       def_bool y
-       prompt "Handle BlockACK Requests in Firmware"
-       ---help---
-        Enables a firmware mechanism to answer incoming BlockACK requests.
-        This feature is necessary to comply with 802.11n. So say Y,
-        if you have plans to support this operation mode.
-
-config CARL9170FW_BACK_REQS_NUM
-       default 4
-       int
-       prompt "Number of max. active BlockACK Request"
-       depends on CARL9170FW_HANDLE_BACK_REQ
-
 config CARL9170FW_CAB_QUEUE
        def_bool y
        prompt "Support software-based Content after Beacon Queue"
@@ -114,6 +100,16 @@ config CARL9170FW_EXPERIMENTAL
        def_bool y
        prompt "Experimental Features"
 
+config CARL9170FW_RADAR
+       def_bool n
+       prompt "Radar pattern generator"
+       depends on CARL9170FW_EXPERIMENTAL
+       ---help---
+        With this option enabled, the firmware can generate random
+        transmission pattern that might fool a reciever to believe
+        that there is an active radar on the channel.
+        Note: sadly, no SDR here.
+
 config CARL9170FW_WOL_OPTION
        def_bool n
        prompt "Wakeup on WLAN"
@@ -127,13 +123,15 @@ config CARL9170FW_WOL
        def_bool n
        depends on CARL9170FW_WOL_OPTION
 
-config CARL9170FW_WOL_MAGIC_PACKET
+config CARL9170FW_WOL_NL80211_TRIGGERS
        def_bool n
-       prompt "Magic Packet(tm)"
+       prompt "Standard NL80211 wakeup triggers"
        depends on CARL9170FW_WOL_OPTION
        select CARL9170FW_WOL
        ---help---
-        Sniff all incoming data frames for the magic packet pattern.
+        Available triggers:
+         * Magic Packet(tm) pattern
+         * disconnect event
 
 config CARL9170FW_WOL_PROBE_REQUEST
        def_bool n
@@ -160,6 +158,11 @@ config CARL9170FW_FW_MAC_RESET
        prompt "Firmware MAC Chip recovery"
        depends on CARL9170FW_EXPERIMENTAL
 
+config CARL9170FW_NOISY_MAC_RESET
+       def_bool n
+       prompt "Notify MAC RESET events"
+       depends on CARL9170FW_FW_MAC_RESET
+
 config CARL9170FW_BROKEN_FEATURES
        def_bool n
        prompt "Broken Featurs"
@@ -205,35 +208,9 @@ config CARL9170FW_UART_CLOCK_40M
 
 endchoice
 
-
-choice
-       prompt "TX / RX Path"
-
-       default CARL9170FW_NORMAL_TX_RX
-
-       config CARL9170FW_NORMAL_TX_RX
-               bool
-               prompt "Normal WLAN TX/RX routines"
-
-       config CARL9170FW_LOOPBACK
-               bool
-               depends on CARL9170FW_BROKEN_FEATURES
-               prompt "TX->(tx feedback)->RX loopback"
-               ---help---
-                Useful carlu testcase.
-
-       config CARL9170FW_DISCARD
-               bool
-               depends on CARL9170FW_BROKEN_FEATURES
-               prompt "TX->(tx feedback)"
-               ---help---
-                Useful carlu testcase
-
-endchoice
-
 config CARL9170FW_UNUSABLE
        def_bool y
-       depends on CARL9170FW_BROKEN || CARL9170FW_LOOPBACK
+       depends on CARL9170FW_BROKEN || CARL9170FW_DEBUG
 
 config CARL9170FW_USB_MODESWITCH
        def_bool n