iwlwifi: fix Kconfig issues
Randy fixes a few issues in iwlwifi's Kconfig. Because of this, 'Debugging options' was not indented under iwlwifi using menuconfig. I added a few other fixes on the way, like the link to the website and added 7265 in the supported NICs. Reported-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Reviewed-by: Johannes Berg <johannes.berg@intel.com> [ Commit message + other fixes ] Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This commit is contained in:
parent
745160ee10
commit
ae7486a2b7
|
@ -20,16 +20,17 @@ config IWLWIFI
|
||||||
Intel 2000 Series Wi-Fi Adapters
|
Intel 2000 Series Wi-Fi Adapters
|
||||||
Intel 7260 Wi-Fi Adapter
|
Intel 7260 Wi-Fi Adapter
|
||||||
Intel 3160 Wi-Fi Adapter
|
Intel 3160 Wi-Fi Adapter
|
||||||
|
Intel 7265 Wi-Fi Adapter
|
||||||
|
|
||||||
|
|
||||||
This driver uses the kernel's mac80211 subsystem.
|
This driver uses the kernel's mac80211 subsystem.
|
||||||
|
|
||||||
In order to use this driver, you will need a microcode (uCode)
|
In order to use this driver, you will need a firmware
|
||||||
image for it. You can obtain the microcode from:
|
image for it. You can obtain the microcode from:
|
||||||
|
|
||||||
<http://intellinuxwireless.org/>.
|
<http://wireless.kernel.org/en/users/Drivers/iwlwifi>.
|
||||||
|
|
||||||
The microcode is typically installed in /lib/firmware. You can
|
The firmware is typically installed in /lib/firmware. You can
|
||||||
look in the hotplug script /etc/hotplug/firmware.agent to
|
look in the hotplug script /etc/hotplug/firmware.agent to
|
||||||
determine which directory FIRMWARE_DIR is set to when the script
|
determine which directory FIRMWARE_DIR is set to when the script
|
||||||
runs.
|
runs.
|
||||||
|
@ -39,9 +40,10 @@ config IWLWIFI
|
||||||
say M here and read <file:Documentation/kbuild/modules.txt>. The
|
say M here and read <file:Documentation/kbuild/modules.txt>. The
|
||||||
module will be called iwlwifi.
|
module will be called iwlwifi.
|
||||||
|
|
||||||
|
if IWLWIFI
|
||||||
|
|
||||||
config IWLWIFI_LEDS
|
config IWLWIFI_LEDS
|
||||||
bool
|
bool
|
||||||
depends on IWLWIFI
|
|
||||||
depends on LEDS_CLASS=y || LEDS_CLASS=IWLWIFI
|
depends on LEDS_CLASS=y || LEDS_CLASS=IWLWIFI
|
||||||
select LEDS_TRIGGERS
|
select LEDS_TRIGGERS
|
||||||
select MAC80211_LEDS
|
select MAC80211_LEDS
|
||||||
|
@ -49,7 +51,7 @@ config IWLWIFI_LEDS
|
||||||
|
|
||||||
config IWLDVM
|
config IWLDVM
|
||||||
tristate "Intel Wireless WiFi DVM Firmware support"
|
tristate "Intel Wireless WiFi DVM Firmware support"
|
||||||
depends on IWLWIFI
|
depends on m
|
||||||
default IWLWIFI
|
default IWLWIFI
|
||||||
help
|
help
|
||||||
This is the driver that supports the DVM firmware which is
|
This is the driver that supports the DVM firmware which is
|
||||||
|
@ -58,7 +60,7 @@ config IWLDVM
|
||||||
|
|
||||||
config IWLMVM
|
config IWLMVM
|
||||||
tristate "Intel Wireless WiFi MVM Firmware support"
|
tristate "Intel Wireless WiFi MVM Firmware support"
|
||||||
depends on IWLWIFI
|
depends on m
|
||||||
help
|
help
|
||||||
This is the driver that supports the MVM firmware which is
|
This is the driver that supports the MVM firmware which is
|
||||||
currently only available for 7260 and 3160 devices.
|
currently only available for 7260 and 3160 devices.
|
||||||
|
@ -70,7 +72,7 @@ config IWLWIFI_OPMODE_MODULAR
|
||||||
default y if IWLMVM=m
|
default y if IWLMVM=m
|
||||||
|
|
||||||
comment "WARNING: iwlwifi is useless without IWLDVM or IWLMVM"
|
comment "WARNING: iwlwifi is useless without IWLDVM or IWLMVM"
|
||||||
depends on IWLWIFI && IWLDVM=n && IWLMVM=n
|
depends on IWLDVM=n && IWLMVM=n
|
||||||
|
|
||||||
config IWLWIFI_BCAST_FILTERING
|
config IWLWIFI_BCAST_FILTERING
|
||||||
bool "Enable broadcast filtering"
|
bool "Enable broadcast filtering"
|
||||||
|
@ -86,11 +88,9 @@ config IWLWIFI_BCAST_FILTERING
|
||||||
expect incoming broadcasts for their normal operations.
|
expect incoming broadcasts for their normal operations.
|
||||||
|
|
||||||
menu "Debugging Options"
|
menu "Debugging Options"
|
||||||
depends on IWLWIFI
|
|
||||||
|
|
||||||
config IWLWIFI_DEBUG
|
config IWLWIFI_DEBUG
|
||||||
bool "Enable full debugging output in the iwlwifi driver"
|
bool "Enable full debugging output in the iwlwifi driver"
|
||||||
depends on IWLWIFI
|
|
||||||
---help---
|
---help---
|
||||||
This option will enable debug tracing output for the iwlwifi drivers
|
This option will enable debug tracing output for the iwlwifi drivers
|
||||||
|
|
||||||
|
@ -115,7 +115,7 @@ config IWLWIFI_DEBUG
|
||||||
|
|
||||||
config IWLWIFI_DEBUGFS
|
config IWLWIFI_DEBUGFS
|
||||||
bool "iwlwifi debugfs support"
|
bool "iwlwifi debugfs support"
|
||||||
depends on IWLWIFI && MAC80211_DEBUGFS
|
depends on MAC80211_DEBUGFS
|
||||||
---help---
|
---help---
|
||||||
Enable creation of debugfs files for the iwlwifi drivers. This
|
Enable creation of debugfs files for the iwlwifi drivers. This
|
||||||
is a low-impact option that allows getting insight into the
|
is a low-impact option that allows getting insight into the
|
||||||
|
@ -123,13 +123,12 @@ config IWLWIFI_DEBUGFS
|
||||||
|
|
||||||
config IWLWIFI_DEBUG_EXPERIMENTAL_UCODE
|
config IWLWIFI_DEBUG_EXPERIMENTAL_UCODE
|
||||||
bool "Experimental uCode support"
|
bool "Experimental uCode support"
|
||||||
depends on IWLWIFI && IWLWIFI_DEBUG
|
depends on IWLWIFI_DEBUG
|
||||||
---help---
|
---help---
|
||||||
Enable use of experimental ucode for testing and debugging.
|
Enable use of experimental ucode for testing and debugging.
|
||||||
|
|
||||||
config IWLWIFI_DEVICE_TRACING
|
config IWLWIFI_DEVICE_TRACING
|
||||||
bool "iwlwifi device access tracing"
|
bool "iwlwifi device access tracing"
|
||||||
depends on IWLWIFI
|
|
||||||
depends on EVENT_TRACING
|
depends on EVENT_TRACING
|
||||||
help
|
help
|
||||||
Say Y here to trace all commands, including TX frames and IO
|
Say Y here to trace all commands, including TX frames and IO
|
||||||
|
@ -145,3 +144,5 @@ config IWLWIFI_DEVICE_TRACING
|
||||||
If unsure, say Y so we can help you better when problems
|
If unsure, say Y so we can help you better when problems
|
||||||
occur.
|
occur.
|
||||||
endmenu
|
endmenu
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
Loading…
Reference in New Issue