Merge branch 'master' into radar

[carl9170fw.git] / carlfw / Kconfig

diff --git a/carlfw/Kconfig b/carlfw/Kconfig
index c2da51a0820ec4997a3fa57384747a53b869f5a8..4cec81cef2e7f424b9c90e768c8bff6aa945ad90 100644 (file)
--- a/carlfw/Kconfig
+++ b/carlfw/Kconfig
@@ -65,21 +65,6 @@ config CARL9170FW_RADIO_FUNCTIONS
 
 endmenu
 
-menu "802.11 Firmware Features"
-
-config CARL9170FW_CAB_QUEUE
-       def_bool y
-       prompt "Support software-based Content after Beacon Queue"
-       ---help---
-        This (software) queue is used to send any broad-/multi-cast buffered
-        frames after the next DTIM beacon.
-
-        This feature is required for Accesspoint mode operation.
-
-        Say Y.
-
-endmenu
-
 source "carlfw/usb/Kconfig"
 
 menu "Experimental, Unstable & Testing Extensions"
@@ -215,7 +200,7 @@ config CARL9170FW_UNUSABLE
 config CARL9170FW_USB_MODESWITCH
        def_bool n
        prompt "USB 1.1 / 2.0 switching support"
-       depends on CARL9170FW_BROKEN_FEATURES
+       depends on CARL9170FW_BROKEN_FEATURES && CARL9170FW_USB_STANDARD_CMDS
        ---help---
         Mostly implemented, but untested and some serious
         doubts remain.