From c8b0e6e19c0bcd30689cb6c6f64eb140f5d61894 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Thu, 25 Oct 2007 17:15:51 +0800 Subject: iwlwifi: cleanup Kconfig and ifdefs to split 3945 and 4965 Currently the iwl3945 & iwl4965 drivers share some common Kconfig symbols. This split it up into options for the individual drivers and gets rid of all the CONFIG_IWLWIFI cruft. Signed-off-by: Christoph Hellwig Signed-off-by: Zhu Yi Signed-off-by: John W. Linville --- drivers/net/wireless/iwlwifi/Kconfig | 169 +++++++++++++++++++++-------------- 1 file changed, 100 insertions(+), 69 deletions(-) (limited to 'drivers/net/wireless/iwlwifi/Kconfig') diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig index 8d52a26c248..74243fe9dca 100644 --- a/drivers/net/wireless/iwlwifi/Kconfig +++ b/drivers/net/wireless/iwlwifi/Kconfig @@ -1,107 +1,95 @@ -config IWLWIFI - bool "Intel Wireless WiFi Link Drivers" - depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL +config IWL4965 + tristate "Intel Wireless WiFi 4965AGN" + depends on m && PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL select FW_LOADER - default n - ---help--- - Select to enable drivers based on the iwlwifi project. This - project provides a common foundation for Intel's wireless - drivers designed to use the mac80211 subsystem. - - See for - information on the capabilities currently enabled in this - driver and for tips for debugging issues and problems. - -config IWLWIFI_DEBUG - bool "Enable full debugging output in iwlwifi drivers" - depends on IWLWIFI - default y + default m ---help--- - This option will enable debug tracing output for the iwlwifi - drivers. + Select to build the driver supporting the: - 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 + Intel Wireless WiFi Link 4965AGN - /sys/bus/pci/drivers/${DRIVER}/debug_level + This driver uses the kernel's mac80211 subsystem. - This entry will only exist if this option is enabled. + See for + information on the capabilities currently enabled in this + driver and for tips for debugging any issues or problems. - To set a value, simply echo an 8-byte hex value to the same file: + In order to use this driver, you will need a microcode (uCode) + image for it. You can obtain the microcode from: - % echo 0x43fff > /sys/bus/pci/drivers/${DRIVER}/debug_level + . - You can find the list of debug mask values in: - drivers/net/wireless/mac80211/iwlwifi/iwl-debug.h + See the above referenced README.iwlwifi for information on where + to install the microcode images. - 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. + If you want to compile the driver as a module ( = code which can be + inserted in and remvoed from the running kernel whenever you want), + say M here and read . The + module will be called iwl4965.ko. -config IWLWIFI_SENSITIVITY - bool "Enable Sensitivity Calibration in iwlwifi drivers" - depends on IWLWIFI +config IWL4965_QOS + bool "Enable Wireless QoS in iwl4965 driver" + depends on IWL4965 default y ---help--- - This option will enable sensitivity calibration for the iwlwifi - drivers. + This option will enable wireless quality of service (QoS) for the + iw4965 driver. -config IWLWIFI_SPECTRUM_MEASUREMENT - bool "Enable Spectrum Measurement in iwlwifi drivers" - depends on IWLWIFI +config IWL4965_SPECTRUM_MEASUREMENT + bool "Enable Spectrum Measurement in iw4965 driver" + depends on IWL4965 default y ---help--- - This option will enable spectrum measurement for the iwlwifi drivers. + This option will enable spectrum measurement for the iwl4965 driver. -config IWLWIFI_QOS - bool "Enable Wireless QoS in iwlwifi drivers" - depends on IWLWIFI +config IWL4965_SENSITIVITY + bool "Enable Sensitivity Calibration in iwl4965 driver" + depends on IWL4965 default y ---help--- - This option will enable wireless quality of service (QoS) for the - iwlwifi drivers. + This option will enable sensitivity calibration for the iwl4965 + driver. -config IWLWIFI_HT - bool "Enable 802.11n HT features in iwlwifi drivers" +config IWL4965_HT + bool "Enable 802.11n HT features in iwl4965 driver" depends on EXPERIMENTAL - depends on IWLWIFI && MAC80211_HT + depends on IWL4965 && MAC80211_HT default n ---help--- This option enables IEEE 802.11n High Throughput features - for the iwlwifi drivers. + for the iwl4965 driver. -config IWL4965 - tristate "Intel Wireless WiFi 4965AGN" - depends on m && IWLWIFI && EXPERIMENTAL - default m +config IWL4965_DEBUG + bool "Enable full debugging output in iwl4965 driver" + depends on IWL4965 + default y ---help--- - Select to build the driver supporting the: + This option will enable debug tracing output for the iwl4965 + driver. - Intel Wireless WiFi Link 4965AGN + 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 - This driver uses the kernel's mac80211 subsystem. + /sys/bus/pci/drivers/${DRIVER}/debug_level - See for - information on the capabilities currently enabled in this - driver and for tips for debugging any issues or problems. + This entry will only exist if this option is enabled. - In order to use this driver, you will need a microcode (uCode) - image for it. You can obtain the microcode from: + To set a value, simply echo an 8-byte hex value to the same file: - . + % echo 0x43fff > /sys/bus/pci/drivers/${DRIVER}/debug_level - See the above referenced README.iwlwifi for information on where - to install the microcode images. + You can find the list of debug mask values in: + drivers/net/wireless/iwlwifi/iwl-4965-debug.h - If you want to compile the driver as a module ( = code which can be - inserted in and remvoed from the running kernel whenever you want), - say M here and read . The - module will be called iwl4965.ko. + 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. config IWL3945 tristate "Intel PRO/Wireless 3945ABG/BG Network Connection" - depends on m && IWLWIFI && EXPERIMENTAL + depends on m && PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL + select FW_LOADER default m ---help--- Select to build the driver supporting the: @@ -126,3 +114,46 @@ config IWL3945 inserted in and remvoed from the running kernel whenever you want), say M here and read . The module will be called iwl3945.ko. + +config IWL3945_QOS + bool "Enable Wireless QoS in iwl3945 driver" + depends on IWL3945 + default y + ---help--- + This option will enable wireless quality of service (QoS) for the + iwl3945 driver. + +config IWL3945_SPECTRUM_MEASUREMENT + bool "Enable Spectrum Measurement in iwl3945 drivers" + depends on IWL3945 + default y + ---help--- + This option will enable spectrum measurement for the iwl3945 driver. + +config IWL3945_DEBUG + bool "Enable full debugging output in iwl3945 driver" + depends on IWL3945 + default y + ---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. + -- cgit v1.2.3