Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / iwlwifi / Kconfig

diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index 9a25f550fd16461067b029b3c7a4fcf6e458ebb5..995dd537083f48cbeca53aacd5ab2ba2e271222a 100644 (file)
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -1,21 +1,31 @@
 config IWLWIFI
 config IWLWIFI

-       bool
-       default n
+       tristate

 
 config IWLCORE
        tristate "Intel Wireless Wifi Core"
        depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
        select IWLWIFI
 
 config IWLCORE
        tristate "Intel Wireless Wifi Core"
        depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
        select IWLWIFI

+       select MAC80211_LEDS if IWLWIFI_LEDS
+       select LEDS_CLASS if IWLWIFI_LEDS
+       select RFKILL if IWLWIFI_RFKILL
+       select RFKILL_INPUT if IWLWIFI_RFKILL

 
 config IWLWIFI_LEDS
        bool
        default n
 
 
 config IWLWIFI_LEDS
        bool
        default n
 

+config IWLWIFI_RUN_TIME_CALIB
+       bool
+       depends on IWLCORE
+       default n
+       ---help---
+         This option will enable run time calibration for the iwlwifi driver.
+         These calibrations are Sensitivity and Chain Noise.
+
+

 config IWLWIFI_RFKILL
        boolean "IWLWIFI RF kill support"
        depends on IWLCORE
 config IWLWIFI_RFKILL
        boolean "IWLWIFI RF kill support"
        depends on IWLCORE

-       select RFKILL
-       select RFKILL_INPUT

 
 config IWL4965
        tristate "Intel Wireless WiFi 4965AGN"
 
 config IWL4965
        tristate "Intel Wireless WiFi 4965AGN"


@@ -55,8 +65,6 @@ config IWL4965_HT
 config IWL4965_LEDS
        bool "Enable LEDS features in iwl4965 driver"
        depends on IWL4965
 config IWL4965_LEDS
        bool "Enable LEDS features in iwl4965 driver"
        depends on IWL4965

-       select MAC80211_LEDS
-       select LEDS_CLASS

        select IWLWIFI_LEDS
        ---help---
          This option enables LEDS for the iwlwifi drivers
        select IWLWIFI_LEDS
        ---help---
          This option enables LEDS for the iwlwifi drivers


@@ -68,12 +76,14 @@ config IWL4965_SPECTRUM_MEASUREMENT
        ---help---
          This option will enable spectrum measurement for the iwl4965 driver.
 
        ---help---
          This option will enable spectrum measurement for the iwl4965 driver.
 

-config IWL4965_SENSITIVITY
-       bool "Enable Sensitivity Calibration in iwl4965 driver"
+config IWL4965_RUN_TIME_CALIB
+       bool "Enable run time Calibration for 4965 NIC"
+       select IWLWIFI_RUN_TIME_CALIB

        depends on IWL4965
        depends on IWL4965

+       default y

        ---help---
        ---help---

-         This option will enable sensitivity calibration for the iwl4965
-         driver.
+         This option will enable run time calibration for the iwl4965 driver.
+         These calibrations are Sensitivity and Chain Noise. If unsure, say yes

 
 config IWLWIFI_DEBUG
        bool "Enable full debugging output in iwl4965 driver"
 
 config IWLWIFI_DEBUG
        bool "Enable full debugging output in iwl4965 driver"


@@ -101,6 +111,23 @@ config IWLWIFI_DEBUG
          as the debug information can assist others in helping you resolve
          any problems you may encounter.
 
          as the debug information can assist others in helping you resolve
          any problems you may encounter.
 

+config IWL5000
+       bool "Intel Wireless WiFi 5000AGN"
+       depends on IWL4965
+       ---help---
+         This option enables support for Intel Wireless WiFi Link 5000AGN Family
+         Dependency on 4965 is temporary
+
+config IWL5000_RUN_TIME_CALIB
+       bool "Enable run time Calibration for 5000 NIC"
+       select IWLWIFI_RUN_TIME_CALIB
+       depends on IWL5000
+       default y
+       ---help---
+         This option will enable run time calibration for the iwl5000 driver.
+         These calibrations are Sensitivity and Chain Noise. If unsure, say yes
+
+

 config IWLWIFI_DEBUGFS
         bool "Iwlwifi debugfs support"
         depends on IWLCORE && IWLWIFI_DEBUG && MAC80211_DEBUGFS
 config IWLWIFI_DEBUGFS
         bool "Iwlwifi debugfs support"
         depends on IWLCORE && IWLWIFI_DEBUG && MAC80211_DEBUGFS


@@ -112,6 +139,8 @@ config IWL3945
        depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
        select FW_LOADER
        select IWLWIFI
        depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
        select FW_LOADER
        select IWLWIFI

+       select MAC80211_LEDS if IWL3945_LEDS
+       select LEDS_CLASS if IWL3945_LEDS

        ---help---
          Select to build the driver supporting the:
 
        ---help---
          Select to build the driver supporting the:
 


@@ -143,8 +172,6 @@ config IWL3945_SPECTRUM_MEASUREMENT
 config IWL3945_LEDS
        bool "Enable LEDS features in iwl3945 driver"
        depends on IWL3945
 config IWL3945_LEDS
        bool "Enable LEDS features in iwl3945 driver"
        depends on IWL3945

-       select MAC80211_LEDS
-       select LEDS_CLASS

        ---help---
          This option enables LEDS for the iwl3945 driver.
 
        ---help---
          This option enables LEDS for the iwl3945 driver.