Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af433063 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 2d6a5e95 808ff697

drivers/net/wireless/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -473,6 +473,15 @@ config MAC80211_HWSIM 
	  To compile this driver as a module, choose M here: the module will be

	  called mac80211_hwsim.  If unsure, say N.



config MWL8K

	tristate "Marvell 88W8xxx PCI/PCIe Wireless support"

	depends on MAC80211 && PCI && WLAN_80211 && EXPERIMENTAL

	---help---

	  This driver supports Marvell TOPDOG 802.11 wireless cards.



	  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/ath5k/Kconfig"

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

drivers/net/wireless/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/ 


obj-$(CONFIG_ADM8211)	+= adm8211.o



obj-$(CONFIG_MWL8K)	+= mwl8k.o



obj-$(CONFIG_IWLWIFI)	+= iwlwifi/

obj-$(CONFIG_RT2X00)	+= rt2x00/

drivers/net/wireless/airo_cs.c

+38 −35
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#include <pcmcia/cisreg.h>

#include <pcmcia/ds.h>



#include <asm/io.h>

#include <linux/io.h>

#include <asm/system.h>



#include "airo.h"
@@ -62,9 +62,9 @@ static char *version = "$Revision: 1.2 $"; 
/*====================================================================*/



MODULE_AUTHOR("Benjamin Reed");

MODULE_DESCRIPTION("Support for Cisco/Aironet 802.11 wireless ethernet \

                   cards.  This is the module that links the PCMCIA card \

		   with the airo module.");

MODULE_DESCRIPTION("Support for Cisco/Aironet 802.11 wireless ethernet "

		   "cards.  This is the module that links the PCMCIA card "

		   "with the airo module.");

MODULE_LICENSE("Dual BSD/GPL");

MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340 PCMCIA cards");
@@ -103,8 +103,9 @@ static void airo_detach(struct pcmcia_device *p_dev); 
   by one struct pcmcia_device structure (defined in ds.h).



   You may not want to use a linked list for this -- for example, the

   memory card driver uses an array of struct pcmcia_device pointers, where minor

   device numbers are used to derive the corresponding array index.

   memory card driver uses an array of struct pcmcia_device pointers,

   where minor device numbers are used to derive the corresponding

   array index.

*/



/*
@@ -331,11 +332,13 @@ static int airo_config(struct pcmcia_device *link) 
	  the I/O windows and the interrupt mapping, and putting the

	  card and host interface into "Memory and IO" mode.

	*/

	CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));

	CS_CHECK(RequestConfiguration,

		 pcmcia_request_configuration(link, &link->conf));

	((local_info_t *)link->priv)->eth_dev =

		init_airo_card(link->irq.AssignedIRQ,

			       link->io.BasePort1, 1, &handle_to_dev(link));

	if (!((local_info_t*)link->priv)->eth_dev) goto cs_failed;

	if (!((local_info_t *)link->priv)->eth_dev)

		goto cs_failed;



	/*

	  At this point, the dev_node_t structure(s) need to be

drivers/net/wireless/ath5k/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -10,5 +10,6 @@ ath5k-y += phy.o 
ath5k-y				+= reset.o

ath5k-y				+= attach.o

ath5k-y				+= base.o

ath5k-y				+= led.o

ath5k-$(CONFIG_ATH5K_DEBUG)	+= debug.o

obj-$(CONFIG_ATH5K)		+= ath5k.o

drivers/net/wireless/ath5k/ath5k.h

+6 −0
Original line number Diff line number Diff line
@@ -1129,6 +1129,12 @@ struct ath5k_hw { 
extern struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version);

extern void ath5k_hw_detach(struct ath5k_hw *ah);



/* LED functions */

extern int ath5k_init_leds(struct ath5k_softc *sc);

extern void ath5k_led_enable(struct ath5k_softc *sc);

extern void ath5k_led_off(struct ath5k_softc *sc);

extern void ath5k_unregister_leds(struct ath5k_softc *sc);



/* Reset Functions */

extern int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, int flags, bool initial);

extern int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode, struct ieee80211_channel *channel, bool change_channel);