iwlwifi: check IEEE80211_TX_STAT_AMPDU for agg pkt

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / iwlwifi / Kconfig

diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index 47bee0ee0a7c3b1a040f477f450a2ecd4692e4ee..a894deb065d7b20ea913e4fdad773415da64d442 100644 (file)
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -1,26 +1,31 @@
 config IWLWIFI
-       tristate
-
-config IWLCORE
-       tristate "Intel Wireless Wifi Core"
+       tristate "Intel Wireless Wifi"
        depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
        select LIB80211
-       select IWLWIFI
+       select FW_LOADER
        select MAC80211_LEDS if IWLWIFI_LEDS
        select LEDS_CLASS if IWLWIFI_LEDS
        select RFKILL if IWLWIFI_RFKILL
+       select MAC80211_LEDS if IWL3945_LEDS
+       select LEDS_CLASS if IWL3945_LEDS
 
 config IWLWIFI_LEDS
-       bool
-       default n
+       bool "Enable LED support in iwlagn driver"
+       depends on IWLWIFI
 
 config IWLWIFI_RFKILL
-       boolean "Iwlwifi RF kill support"
-       depends on IWLCORE
+       bool "Enable RF kill support in iwlagn and iwl3945 drivers"
+       depends on IWLWIFI
+
+config IWLWIFI_SPECTRUM_MEASUREMENT
+       bool "Enable Spectrum Measurement in iwlagn driver"
+       depends on IWLWIFI
+       ---help---
+         This option will enable spectrum measurement for the iwlagn driver.
 
 config IWLWIFI_DEBUG
-       bool "Enable full debugging output in iwlagn driver"
-       depends on IWLCORE
+       bool "Enable full debugging output in iwlagn and iwl3945 drivers"
+       depends on IWLWIFI
        ---help---
          This option will enable debug tracing output for the iwlwifi drivers
 
@@ -44,16 +49,14 @@ config IWLWIFI_DEBUG
          any problems you may encounter.
 
 config IWLWIFI_DEBUGFS
-        bool "Iwlwifi debugfs support"
-        depends on IWLCORE && IWLWIFI_DEBUG && MAC80211_DEBUGFS
+        bool "iwlagn debugfs support"
+        depends on IWLWIFI && IWLWIFI_DEBUG && MAC80211_DEBUGFS
         ---help---
          Enable creation of debugfs files for the iwlwifi drivers.
 
 config IWLAGN
-       tristate "Intel Wireless WiFi Next Gen AGN"
-       depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
-       select FW_LOADER
-       select IWLCORE
+       tristate "Intel Wireless WiFi Next Gen AGN (iwlagn)"
+       depends on IWLWIFI
        ---help---
          Select to build the driver supporting the:
 
@@ -76,19 +79,6 @@ config IWLAGN
          say M here and read <file:Documentation/kbuild/modules.txt>.  The
          module will be called iwlagn.ko.
 
-config IWLAGN_SPECTRUM_MEASUREMENT
-       bool "Enable Spectrum Measurement in iwlagn driver"
-       depends on IWLAGN
-       ---help---
-         This option will enable spectrum measurement for the iwlagn driver.
-
-config IWLAGN_LEDS
-       bool "Enable LEDS features in iwlagn driver"
-       depends on IWLAGN
-       select IWLWIFI_LEDS
-       ---help---
-         This option enables LEDS for the iwlagn drivers
-
 
 config IWL4965
        bool "Intel Wireless WiFi 4965AGN"
@@ -97,20 +87,14 @@ config IWL4965
          This option enables support for Intel Wireless WiFi Link 4965AGN
 
 config IWL5000
-       bool "Intel Wireless WiFi 5000AGN"
+       bool "Intel Wireless WiFi 5000AGN; Intel WiFi Link 1000, 6000, and 6050 Series"
        depends on IWLAGN
        ---help---
          This option enables support for Intel Wireless WiFi Link 5000AGN Family
 
 config IWL3945
-       tristate "Intel PRO/Wireless 3945ABG/BG Network Connection"
-       depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
-       select FW_LOADER
-       select LIB80211
-       select IWLWIFI
-       select MAC80211_LEDS if IWL3945_LEDS
-       select LEDS_CLASS if IWL3945_LEDS
-       select RFKILL if IWL3945_RFKILL
+       tristate "Intel PRO/Wireless 3945ABG/BG Network Connection (iwl3945)"
+       depends on IWLWIFI
        ---help---
          Select to build the driver supporting the:
 
@@ -133,12 +117,8 @@ config IWL3945
          say M here and read <file:Documentation/kbuild/modules.txt>.  The
          module will be called iwl3945.ko.
 
-config IWL3945_RFKILL
-       bool "Enable RF kill support in iwl3945 drivers"
-       depends on IWL3945
-
 config IWL3945_SPECTRUM_MEASUREMENT
-       bool "Enable Spectrum Measurement in iwl3945 drivers"
+       bool "Enable Spectrum Measurement in iwl3945 driver"
        depends on IWL3945
        ---help---
          This option will enable spectrum measurement for the iwl3945 driver.
@@ -148,30 +128,3 @@ config IWL3945_LEDS
        depends on IWL3945
        ---help---
          This option enables LEDS for the iwl3945 driver.
-
-config IWL3945_DEBUG
-       bool "Enable full debugging output in iwl3945 driver"
-       depends on IWL3945
-       ---help---
-         This option will enable debug tracing output for the iwl3945
-         driver.
-
-         This will result in the kernel module being ~100k larger.  You can
-         control which debug output is sent to the kernel log by setting the
-         value in
-
-                 /sys/bus/pci/drivers/${DRIVER}/debug_level
-
-         This entry will only exist if this option is enabled.
-
-         To set a value, simply echo an 8-byte hex value to the same file:
-
-                 % echo 0x43fff > /sys/bus/pci/drivers/${DRIVER}/debug_level
-
-         You can find the list of debug mask values in:
-                 drivers/net/wireless/iwlwifi/iwl-3945-debug.h
-
-         If this is your first time using this driver, you should say Y here
-         as the debug information can assist others in helping you resolve
-         any problems you may encounter.
-