Commit 8aa0f64a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

parents cd7e1f0b eab2ec83

drivers/net/wireless/Kconfig

+30 −54
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
menuconfig WLAN

	bool "Wireless LAN"

	depends on !S390

	select WIRELESS

	default y

	---help---

	  This section contains all the pre 802.11 and 802.11 wireless
@@ -67,6 +68,8 @@ config WAVELAN 
	tristate "AT&T/Lucent old WaveLAN & DEC RoamAbout DS ISA support"

	depends on ISA && WLAN_PRE80211

	select WIRELESS_EXT

	select WEXT_SPY

	select WEXT_PRIV

	---help---

	  The Lucent WaveLAN (formerly NCR and AT&T; or DEC RoamAbout DS) is

	  a Radio LAN (wireless Ethernet-like Local Area Network) using the
@@ -90,6 +93,8 @@ config PCMCIA_WAVELAN 
	tristate "AT&T/Lucent old WaveLAN Pcmcia wireless support"

	depends on PCMCIA && WLAN_PRE80211

	select WIRELESS_EXT

	select WEXT_SPY

	select WEXT_PRIV

	help

	  Say Y here if you intend to attach an AT&T/Lucent Wavelan PCMCIA

	  (PC-card) wireless Ethernet networking card to your computer.  This
@@ -102,6 +107,7 @@ config PCMCIA_NETWAVE 
	tristate "Xircom Netwave AirSurfer Pcmcia wireless support"

	depends on PCMCIA && WLAN_PRE80211

	select WIRELESS_EXT

	select WEXT_PRIV

	help

	  Say Y here if you intend to attach this type of PCMCIA (PC-card)

	  wireless Ethernet networking card to your computer.
@@ -123,6 +129,8 @@ config PCMCIA_RAYCS 
	tristate "Aviator/Raytheon 2.4GHz wireless support"

	depends on PCMCIA && WLAN_80211

	select WIRELESS_EXT

	select WEXT_SPY

	select WEXT_PRIV

	---help---

	  Say Y here if you intend to attach an Aviator/Raytheon PCMCIA

	  (PC-card) wireless Ethernet networking card to your computer.
@@ -132,46 +140,6 @@ config PCMCIA_RAYCS 
	  To compile this driver as a module, choose M here: the module will be

	  called ray_cs.  If unsure, say N.



config LIBERTAS

	tristate "Marvell 8xxx Libertas WLAN driver support"

	depends on WLAN_80211

	select WIRELESS_EXT

	select LIB80211

	select FW_LOADER

	---help---

	  A library for Marvell Libertas 8xxx devices.



config LIBERTAS_USB

	tristate "Marvell Libertas 8388 USB 802.11b/g cards"

	depends on LIBERTAS && USB

	---help---

	  A driver for Marvell Libertas 8388 USB devices.



config LIBERTAS_CS

	tristate "Marvell Libertas 8385 CompactFlash 802.11b/g cards"

	depends on LIBERTAS && PCMCIA

	select FW_LOADER

	---help---

	  A driver for Marvell Libertas 8385 CompactFlash devices.



config LIBERTAS_SDIO

	tristate "Marvell Libertas 8385/8686/8688 SDIO 802.11b/g cards"

	depends on LIBERTAS && MMC

	---help---

	  A driver for Marvell Libertas 8385/8686/8688 SDIO devices.



config LIBERTAS_SPI

	tristate "Marvell Libertas 8686 SPI 802.11b/g cards"

	depends on LIBERTAS && SPI

	---help---

	  A driver for Marvell Libertas 8686 SPI devices.



config LIBERTAS_DEBUG

	bool "Enable full debugging output in the Libertas module."

	depends on LIBERTAS

	---help---

	  Debugging support.



config LIBERTAS_THINFIRM

	tristate "Marvell 8xxx Libertas WLAN driver support with thin firmware"

	depends on WLAN_80211 && MAC80211
@@ -190,6 +158,8 @@ config AIRO 
	depends on ISA_DMA_API && WLAN_80211 && (PCI || BROKEN)

	select WIRELESS_EXT

	select CRYPTO

	select WEXT_SPY

	select WEXT_PRIV

	---help---

	  This is the standard Linux driver to support Cisco/Aironet ISA and

	  PCI 802.11 wireless cards.
@@ -207,6 +177,7 @@ config ATMEL 
      tristate "Atmel at76c50x chipset  802.11b support"

      depends on (PCI || PCMCIA) && WLAN_80211

      select WIRELESS_EXT

      select WEXT_PRIV

      select FW_LOADER

      select CRC32

       ---help---
@@ -269,7 +240,8 @@ config PCMCIA_WL3501 
	tristate "Planet WL3501 PCMCIA cards"

	depends on EXPERIMENTAL && PCMCIA && WLAN_80211

	select WIRELESS_EXT

       ---help---

	select WEXT_SPY

	help

	  A driver for WL3501 PCMCIA 802.11 wireless cards made by Planet.

	  It has basic support for Linux wireless extensions and initial

	  micro support for ethtool.
@@ -278,6 +250,8 @@ config PRISM54 
	tristate 'Intersil Prism GT/Duette/Indigo PCI/Cardbus (DEPRECATED)'

	depends on PCI && EXPERIMENTAL && WLAN_80211

	select WIRELESS_EXT

	select WEXT_SPY

	select WEXT_PRIV

	select FW_LOADER

	---help---

	  This enables support for FullMAC PCI/Cardbus prism54 devices. This
@@ -300,6 +274,7 @@ config USB_ZD1201 
	tristate "USB ZD1201 based Wireless device support"

	depends on USB && WLAN_80211

	select WIRELESS_EXT

	select WEXT_PRIV

	select FW_LOADER

	---help---

	  Say Y if you want to use wireless LAN adapters based on the ZyDAS
@@ -476,17 +451,18 @@ config MWL8K 
	  To compile this driver as a module, choose M here: the module

	  will be called mwl8k.  If unsure, say N.



source "drivers/net/wireless/p54/Kconfig"

source "drivers/net/wireless/ath/Kconfig"

source "drivers/net/wireless/ipw2x00/Kconfig"

source "drivers/net/wireless/iwlwifi/Kconfig"

source "drivers/net/wireless/hostap/Kconfig"

source "drivers/net/wireless/b43/Kconfig"

source "drivers/net/wireless/b43legacy/Kconfig"

source "drivers/net/wireless/zd1211rw/Kconfig"

source "drivers/net/wireless/rt2x00/Kconfig"

source "drivers/net/wireless/hostap/Kconfig"

source "drivers/net/wireless/ipw2x00/Kconfig"

source "drivers/net/wireless/iwlwifi/Kconfig"

source "drivers/net/wireless/iwmc3200wifi/Kconfig"

source "drivers/net/wireless/libertas/Kconfig"

source "drivers/net/wireless/orinoco/Kconfig"

source "drivers/net/wireless/p54/Kconfig"

source "drivers/net/wireless/rt2x00/Kconfig"

source "drivers/net/wireless/wl12xx/Kconfig"

source "drivers/net/wireless/iwmc3200wifi/Kconfig"

source "drivers/net/wireless/zd1211rw/Kconfig"



endif # WLAN

drivers/net/wireless/at76c50x-usb.c

+10 −0
Original line number Diff line number Diff line
@@ -2217,6 +2217,8 @@ static struct ieee80211_supported_band at76_supported_band = { 
static int at76_init_new_device(struct at76_priv *priv,

				struct usb_interface *interface)

{

	struct wiphy *wiphy;

	size_t len;

	int ret;



	/* set up the endpoint information */
@@ -2254,6 +2256,7 @@ static int at76_init_new_device(struct at76_priv *priv, 
	priv->device_unplugged = 0;



	/* mac80211 initialisation */

	wiphy = priv->hw->wiphy;

	priv->hw->wiphy->max_scan_ssids = 1;

	priv->hw->wiphy->max_scan_ie_len = 0;

	priv->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
@@ -2265,6 +2268,13 @@ static int at76_init_new_device(struct at76_priv *priv, 
	SET_IEEE80211_DEV(priv->hw, &interface->dev);

	SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr);



	len = sizeof(wiphy->fw_version);

	snprintf(wiphy->fw_version, len, "%d.%d.%d-%d",

		 priv->fw_version.major, priv->fw_version.minor,

		 priv->fw_version.patch, priv->fw_version.build);



	wiphy->hw_version = priv->board_type;



	ret = ieee80211_register_hw(priv->hw);

	if (ret) {

		printk(KERN_ERR "cannot register mac80211 hw (status %d)!\n",

drivers/net/wireless/ath/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -16,7 +16,15 @@ menuconfig ATH_COMMON 
	  http://wireless.kernel.org/en/users/Drivers/Atheros



if ATH_COMMON



config ATH_DEBUG

	bool "Atheros wireless debugging"

	---help---

	  Say Y, if you want to debug atheros wireless drivers.

	  Right now only ath9k makes use of this.



source "drivers/net/wireless/ath/ath5k/Kconfig"

source "drivers/net/wireless/ath/ath9k/Kconfig"

source "drivers/net/wireless/ath/ar9170/Kconfig"



endif

drivers/net/wireless/ath/Makefile

+7 −2
Original line number Diff line number Diff line 
obj-$(CONFIG_ATH5K)		+= ath5k/

obj-$(CONFIG_ATH9K)		+= ath9k/

obj-$(CONFIG_ATH9K_HW)		+= ath9k/

obj-$(CONFIG_AR9170_USB)        += ar9170/



obj-$(CONFIG_ATH_COMMON)	+= ath.o

ath-objs 		:= main.o regd.o
 


ath-objs :=	main.o \

		regd.o \

		hw.o



ath-$(CONFIG_ATH_DEBUG) += debug.o

drivers/net/wireless/ath/ar9170/ar9170.h

+2 −2
Original line number Diff line number Diff line
@@ -172,8 +172,6 @@ struct ar9170 { 


	/* interface mode settings */

	struct ieee80211_vif *vif;

	u8 mac_addr[ETH_ALEN];

	u8 bssid[ETH_ALEN];



	/* beaconing */

	struct sk_buff *beacon;
@@ -204,6 +202,8 @@ struct ar9170 { 
	u8 power_2G_ht20[8];

	u8 power_2G_ht40[8];



	u8 phy_heavy_clip;



#ifdef CONFIG_AR9170_LEDS

	struct delayed_work led_work;

	struct ar9170_led leds[AR9170_NUM_LEDS];