diff options
Diffstat (limited to 'drivers/net/wireless/intersil')
| -rw-r--r-- | drivers/net/wireless/intersil/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/intersil/hostap/Kconfig | 12 | ||||
| -rw-r--r-- | drivers/net/wireless/intersil/hostap/hostap_hw.c | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/intersil/orinoco/Kconfig | 12 | ||||
| -rw-r--r-- | drivers/net/wireless/intersil/p54/Kconfig | 10 |
5 files changed, 22 insertions, 19 deletions
diff --git a/drivers/net/wireless/intersil/Kconfig b/drivers/net/wireless/intersil/Kconfig index 4e968912e27c..6a6ce9d4aeee 100644 --- a/drivers/net/wireless/intersil/Kconfig +++ b/drivers/net/wireless/intersil/Kconfig @@ -2,7 +2,7 @@ config WLAN_VENDOR_INTERSIL bool "Intersil devices" default y - ---help--- + help If you have a wireless card belonging to this class, say Y. Note that the answer to this question doesn't directly affect the @@ -23,7 +23,7 @@ config PRISM54 select WEXT_SPY select WEXT_PRIV select FW_LOADER - ---help--- + help This enables support for FullMAC PCI/Cardbus prism54 devices. This driver is now deprecated in favor for the SoftMAC driver, p54pci. p54pci supports FullMAC PCI/Cardbus devices as well. diff --git a/drivers/net/wireless/intersil/hostap/Kconfig b/drivers/net/wireless/intersil/hostap/Kconfig index c70dc168dc63..6ad88299432f 100644 --- a/drivers/net/wireless/intersil/hostap/Kconfig +++ b/drivers/net/wireless/intersil/hostap/Kconfig @@ -15,7 +15,7 @@ config HOSTAP select LIB80211_CRYPT_WEP select LIB80211_CRYPT_TKIP select LIB80211_CRYPT_CCMP - ---help--- + help Shared driver code for IEEE 802.11b wireless cards based on Intersil Prism2/2.5/3 chipset. This driver supports so called Host AP mode that allows the card to act as an IEEE 802.11 @@ -36,7 +36,7 @@ config HOSTAP config HOSTAP_FIRMWARE bool "Support downloading firmware images with Host AP driver" depends on HOSTAP - ---help--- + help Configure Host AP driver to include support for firmware image download. This option by itself only enables downloading to the volatile memory, i.e. the card RAM. This option is required to @@ -49,7 +49,7 @@ config HOSTAP_FIRMWARE config HOSTAP_FIRMWARE_NVRAM bool "Support for non-volatile firmware download" depends on HOSTAP_FIRMWARE - ---help--- + help Allow Host AP driver to write firmware images to the non-volatile card memory, i.e. flash memory that survives power cycling. Enable this option if you want to be able to change card firmware @@ -61,7 +61,7 @@ config HOSTAP_FIRMWARE_NVRAM config HOSTAP_PLX tristate "Host AP driver for Prism2/2.5/3 in PLX9052 PCI adaptors" depends on PCI && HOSTAP - ---help--- + help Host AP driver's version for Prism2/2.5/3 PC Cards in PLX9052 based PCI adaptors. @@ -75,7 +75,7 @@ config HOSTAP_PLX config HOSTAP_PCI tristate "Host AP driver for Prism2.5 PCI adaptors" depends on PCI && HOSTAP - ---help--- + help Host AP driver's version for Prism2.5 PCI adaptors. "Host AP support for Prism2/2.5/3 IEEE 802.11b" is required for this @@ -88,7 +88,7 @@ config HOSTAP_PCI config HOSTAP_CS tristate "Host AP driver for Prism2/2.5/3 PC Cards" depends on PCMCIA && HOSTAP - ---help--- + help Host AP driver's version for Prism2/2.5/3 PC Cards. "Host AP support for Prism2/2.5/3 IEEE 802.11b" is required for this diff --git a/drivers/net/wireless/intersil/hostap/hostap_hw.c b/drivers/net/wireless/intersil/hostap/hostap_hw.c index aadf3dec5bf3..2ab34cf74ecc 100644 --- a/drivers/net/wireless/intersil/hostap/hostap_hw.c +++ b/drivers/net/wireless/intersil/hostap/hostap_hw.c @@ -3048,6 +3048,7 @@ static void prism2_clear_set_tim_queue(local_info_t *local) * This is a natural nesting, which needs a split lock type. */ static struct lock_class_key hostap_netdev_xmit_lock_key; +static struct lock_class_key hostap_netdev_addr_lock_key; static void prism2_set_lockdep_class_one(struct net_device *dev, struct netdev_queue *txq, @@ -3059,6 +3060,8 @@ static void prism2_set_lockdep_class_one(struct net_device *dev, static void prism2_set_lockdep_class(struct net_device *dev) { + lockdep_set_class(&dev->addr_list_lock, + &hostap_netdev_addr_lock_key); netdev_for_each_tx_queue(dev, prism2_set_lockdep_class_one, NULL); } diff --git a/drivers/net/wireless/intersil/orinoco/Kconfig b/drivers/net/wireless/intersil/orinoco/Kconfig index c430d7a46730..c470ee23673f 100644 --- a/drivers/net/wireless/intersil/orinoco/Kconfig +++ b/drivers/net/wireless/intersil/orinoco/Kconfig @@ -10,7 +10,7 @@ config HERMES select FW_LOADER select CRYPTO select CRYPTO_MICHAEL_MIC - ---help--- + help A driver for 802.11b wireless cards based on the "Hermes" or Intersil HFA384x (Prism 2) MAC controller. This includes the vast majority of the PCMCIA 802.11b cards (which are nearly all rebadges) @@ -32,7 +32,7 @@ config HERMES config HERMES_PRISM bool "Support Prism 2/2.5 chipset" depends on HERMES - ---help--- + help Say Y to enable support for Prism 2 and 2.5 chipsets. These chipsets are better handled by the hostap driver. This driver @@ -44,7 +44,7 @@ config HERMES_CACHE_FW_ON_INIT bool "Cache Hermes firmware on driver initialisation" depends on HERMES default y - ---help--- + help Say Y to cache any firmware required by the Hermes drivers on startup. The firmware will remain cached until the driver is unloaded. The cache uses 64K of RAM. @@ -110,7 +110,7 @@ config PCI_HERMES config PCMCIA_HERMES tristate "Hermes PCMCIA card support" depends on PCMCIA && HERMES && HAS_IOPORT_MAP - ---help--- + help A driver for "Hermes" chipset based PCMCIA wireless adaptors, such as the Lucent WavelanIEEE/Orinoco cards and their OEM (Cabletron/ EnteraSys RoamAbout 802.11, ELSA Airlancer, Melco Buffalo and @@ -125,7 +125,7 @@ config PCMCIA_HERMES config PCMCIA_SPECTRUM tristate "Symbol Spectrum24 Trilogy PCMCIA card support" depends on PCMCIA && HERMES && HAS_IOPORT_MAP - ---help--- + help This is a driver for 802.11b cards using RAM-loadable Symbol firmware, such as Symbol Wireless Networker LA4100, CompactFlash @@ -139,5 +139,5 @@ config ORINOCO_USB tristate "Agere Orinoco USB support" depends on USB && HERMES select FW_LOADER - ---help--- + help This driver is for USB versions of the Agere Orinoco card. diff --git a/drivers/net/wireless/intersil/p54/Kconfig b/drivers/net/wireless/intersil/p54/Kconfig index 26cd80732afa..024be5507daf 100644 --- a/drivers/net/wireless/intersil/p54/Kconfig +++ b/drivers/net/wireless/intersil/p54/Kconfig @@ -4,7 +4,7 @@ config P54_COMMON depends on MAC80211 select FW_LOADER select CRC_CCITT - ---help--- + help This is common code for isl38xx/stlc45xx based modules. This module does nothing by itself - the USB/PCI/SPI front-ends also need to be enabled in order to support any devices. @@ -18,7 +18,7 @@ config P54_USB tristate "Prism54 USB support" depends on P54_COMMON && USB select CRC32 - ---help--- + help This driver is for USB isl38xx based wireless cards. These devices require softmac firmware which can be found at @@ -29,7 +29,7 @@ config P54_USB config P54_PCI tristate "Prism54 PCI support" depends on P54_COMMON && PCI - ---help--- + help This driver is for PCI isl38xx based wireless cards. This driver supports most devices that are supported by the fullmac prism54 driver plus many devices which are not @@ -43,7 +43,7 @@ config P54_PCI config P54_SPI tristate "Prism54 SPI (stlc45xx) support" depends on P54_COMMON && SPI_MASTER - ---help--- + help This driver is for stlc4550 or stlc4560 based wireless chips such as Nokia's N800/N810 Portable Internet Tablet. @@ -53,7 +53,7 @@ config P54_SPI_DEFAULT_EEPROM bool "Include fallback EEPROM blob" depends on P54_SPI default n - ---help--- + help Unlike the PCI or USB devices, the SPI variants don't have a dedicated EEPROM chip to store all device specific values for calibration, country and interface settings. |