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

Commit 1725d409 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 b3ff29d2 b8abde45

Documentation/DocBook/mac80211.tmpl

+8 −4
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ 
    </authorgroup>



    <copyright>

      <year>2007</year>

      <year>2008</year>

      <year>2007-2009</year>

      <holder>Johannes Berg</holder>

    </copyright>
@@ -165,8 +164,8 @@ usage should require reading the full document. 
!Pinclude/net/mac80211.h Frame format

      </sect1>

      <sect1>

        <title>Alignment issues</title>

        <para>TBD</para>

        <title>Packet alignment</title>

!Pnet/mac80211/rx.c Packet alignment

      </sect1>

      <sect1>

        <title>Calling into mac80211 from interrupts</title>
@@ -223,6 +222,11 @@ usage should require reading the full document. 
!Finclude/net/mac80211.h ieee80211_key_flags

    </chapter>



    <chapter id="powersave">

      <title>Powersave support</title>

!Pinclude/net/mac80211.h Powersave support

    </chapter>



    <chapter id="qos">

      <title>Multiple queues and QoS support</title>

      <para>TBD</para>

Documentation/feature-removal-schedule.txt

+3 −1
Original line number Diff line number Diff line
@@ -229,7 +229,9 @@ Who: Jan Engelhardt <jengelh@computergmbh.de> 
---------------------------



What:	b43 support for firmware revision < 410

When:	July 2008

When:	The schedule was July 2008, but it was decided that we are going to keep the

        code as long as there are no major maintanance headaches.

	So it _could_ be removed _any_ time now, if it conflicts with something new.

Why:	The support code for the old firmware hurts code readability/maintainability

	and slightly hurts runtime performance. Bugfixes for the old firmware

	are not provided by Broadcom anymore.

drivers/net/wireless/Kconfig

+7 −121
Original line number Diff line number Diff line
@@ -151,6 +151,12 @@ config LIBERTAS_SDIO 
	---help---

	  A driver for Marvell Libertas 8385 and 8686 SDIO devices.



config LIBERTAS_SPI

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

	depends on LIBERTAS && SPI && GENERIC_GPIO

	---help---

	  A driver for Marvell Libertas 8686 SPI devices.



config LIBERTAS_DEBUG

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

	depends on LIBERTAS
@@ -188,127 +194,6 @@ config AIRO 


	  The driver can be compiled as a module and will be named "airo".



config HERMES

	tristate "Hermes chipset 802.11b support (Orinoco/Prism2/Symbol)"

	depends on (PPC_PMAC || PCI || PCMCIA) && WLAN_80211

	select WIRELESS_EXT

	select FW_LOADER

	select CRYPTO

	select CRYPTO_MICHAEL_MIC

	---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)

	  - except for the Cisco/Aironet cards.  Cards supported include the

	  Apple Airport (not a PCMCIA card), WavelanIEEE/Orinoco,

	  Cabletron/EnteraSys Roamabout, ELSA AirLancer, MELCO Buffalo, Avaya,

	  IBM High Rate Wireless, Farralon Syyline, Samsung MagicLAN, Netgear

	  MA401, LinkSys WPC-11, D-Link DWL-650, 3Com AirConnect, Intel

	  IPW2011, and Symbol Spectrum24 High Rate amongst others.



	  This option includes the guts of the driver, but in order to

	  actually use a card you will also need to enable support for PCMCIA

	  Hermes cards, PLX9052 based PCI adaptors or the Apple Airport below.



	  You will also very likely also need the Wireless Tools in order to

	  configure your card and that /etc/pcmcia/wireless.opts works :

	  <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>



config HERMES_CACHE_FW_ON_INIT

	bool "Cache Hermes firmware on driver initialisation"

	depends on HERMES

	default y

	---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.



	  Otherwise load the firmware from userspace as required.  In

	  this case the driver should be unloaded and restarted

	  whenever the firmware is changed.



	  If you are not sure, say Y.



config APPLE_AIRPORT

	tristate "Apple Airport support (built-in)"

	depends on PPC_PMAC && HERMES

	help

	  Say Y here to support the Airport 802.11b wireless Ethernet hardware

	  built into the Macintosh iBook and other recent PowerPC-based

	  Macintosh machines. This is essentially a Lucent Orinoco card with 

	  a non-standard interface.



	  This driver does not support the Airport Extreme (802.11b/g). Use

	  the BCM43xx driver for Airport Extreme cards.



config PLX_HERMES

	tristate "Hermes in PLX9052 based PCI adaptor support (Netgear MA301 etc.)"

	depends on PCI && HERMES

	help

	  Enable support for PCMCIA cards supported by the "Hermes" (aka

	  orinoco) driver when used in PLX9052 based PCI adaptors.  These

	  adaptors are not a full PCMCIA controller but act as a more limited

	  PCI <-> PCMCIA bridge.  Several vendors sell such adaptors so that

	  802.11b PCMCIA cards can be used in desktop machines.  The Netgear

	  MA301 is such an adaptor.



config TMD_HERMES

	tristate "Hermes in TMD7160 based PCI adaptor support"

	depends on PCI && HERMES

	help

	  Enable support for PCMCIA cards supported by the "Hermes" (aka

	  orinoco) driver when used in TMD7160 based PCI adaptors.  These

	  adaptors are not a full PCMCIA controller but act as a more limited

	  PCI <-> PCMCIA bridge.  Several vendors sell such adaptors so that

	  802.11b PCMCIA cards can be used in desktop machines.



config NORTEL_HERMES

	tristate "Nortel emobility PCI adaptor support"

	depends on PCI && HERMES

	help

	  Enable support for PCMCIA cards supported by the "Hermes" (aka

	  orinoco) driver when used in Nortel emobility PCI adaptors.  These

	  adaptors are not full PCMCIA controllers, but act as a more limited

	  PCI <-> PCMCIA bridge.



config PCI_HERMES

	tristate "Prism 2.5 PCI 802.11b adaptor support"

	depends on PCI && HERMES

	help

	  Enable support for PCI and mini-PCI 802.11b wireless NICs based on

	  the Prism 2.5 chipset.  These are true PCI cards, not the 802.11b

	  PCMCIA cards bundled with PCI<->PCMCIA adaptors which are also

	  common.  Some of the built-in wireless adaptors in laptops are of

	  this variety.



config PCMCIA_HERMES

	tristate "Hermes PCMCIA card support"

	depends on PCMCIA && HERMES

	---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

	  others).  It should also be usable on various Prism II based cards

	  such as the Linksys, D-Link and Farallon Skyline.  It should also

	  work on Symbol cards such as the 3Com AirConnect and Ericsson WLAN.



	  You will very likely need the Wireless Tools in order to

	  configure your card and that /etc/pcmcia/wireless.opts works:

	  <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.



config PCMCIA_SPECTRUM

	tristate "Symbol Spectrum24 Trilogy PCMCIA card support"

	depends on PCMCIA && HERMES

	---help---



	  This is a driver for 802.11b cards using RAM-loadable Symbol

	  firmware, such as Symbol Wireless Networker LA4100, CompactFlash

	  cards by Socket Communications and Intel PRO/Wireless 2011B.



	  This driver requires firmware download on startup.  Utilities

	  for downloading Symbol firmware are available at

	  <http://sourceforge.net/projects/orinoco/>



config ATMEL

      tristate "Atmel at76c50x chipset  802.11b support"

      depends on (PCI || PCMCIA) && WLAN_80211
@@ -590,5 +475,6 @@ 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/orinoco/Kconfig"



endmenu

drivers/net/wireless/airo.c

+626 −511

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/ath5k/ath5k.h

+1 −0
Original line number Diff line number Diff line
@@ -1206,6 +1206,7 @@ extern void ath5k_hw_set_rx_filter(struct ath5k_hw *ah, u32 filter); 
/* Beacon control functions */

extern u32 ath5k_hw_get_tsf32(struct ath5k_hw *ah);

extern u64 ath5k_hw_get_tsf64(struct ath5k_hw *ah);

extern void ath5k_hw_set_tsf64(struct ath5k_hw *ah, u64 tsf64);

extern void ath5k_hw_reset_tsf(struct ath5k_hw *ah);

extern void ath5k_hw_init_beacon(struct ath5k_hw *ah, u32 next_beacon, u32 interval);

#if 0