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

Commit e21a2b0c authored by Jeff Garzik's avatar Jeff Garzik
Browse files

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

parents 8a89334c 2638fed7

Documentation/networking/bcm43xx.txt

0 → 100644
+36 −0
Original line number Diff line number Diff line 


			BCM43xx Linux Driver Project

			============================



About this software

-------------------



The goal of this project is to develop a linux driver for Broadcom

BCM43xx chips, based on the specification at 

http://bcm-specs.sipsolutions.net/



The project page is http://bcm43xx.berlios.de/





Requirements

------------



1)	Linux Kernel 2.6.16 or later

	http://www.kernel.org/



	You may want to configure your kernel with:



	CONFIG_DEBUG_FS (optional):

		-> Kernel hacking

		  -> Debug Filesystem



2)	SoftMAC IEEE 802.11 Networking Stack extension and patched ieee80211

	modules:

	http://softmac.sipsolutions.net/



3)	Firmware Files



	Please try fwcutter. Fwcutter can extract the firmware from various 

	binary driver files. It supports driver files from Windows, MacOS and 

	Linux. You can get fwcutter from http://bcm43xx.berlios.de/.

	Also, fwcutter comes with a README file for further instructions.

drivers/net/wireless/Kconfig

+6 −1
Original line number Diff line number Diff line
@@ -309,7 +309,10 @@ config APPLE_AIRPORT 
	  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

	  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.)"
@@ -401,6 +404,7 @@ config PCMCIA_HERMES 
config PCMCIA_SPECTRUM

	tristate "Symbol Spectrum24 Trilogy PCMCIA card support"

	depends on NET_RADIO && PCMCIA && HERMES

	select FW_LOADER

	---help---



	  This is a driver for 802.11b cards using RAM-loadable Symbol
@@ -500,6 +504,7 @@ config PRISM54 
	  will be called prism54.ko.



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

source "drivers/net/wireless/bcm43xx/Kconfig"



# yes, this works even when no drivers are selected

config NET_WIRELESS

drivers/net/wireless/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ obj-$(CONFIG_PCMCIA_ATMEL) += atmel_cs.o 
obj-$(CONFIG_PRISM54)		+= prism54/



obj-$(CONFIG_HOSTAP)		+= hostap/

obj-$(CONFIG_BCM43XX)		+= bcm43xx/



# 16-bit wireless PCMCIA client drivers

obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o

drivers/net/wireless/bcm43xx/Kconfig

0 → 100644
+62 −0
Original line number Diff line number Diff line 
config BCM43XX

	tristate "Broadcom BCM43xx wireless support"

	depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && NET_RADIO && EXPERIMENTAL

	select FW_LOADER

	---help---

	  This is an experimental driver for the Broadcom 43xx wireless chip,

	  found in the Apple Airport Extreme and various other devices.



config BCM43XX_DEBUG

	bool "Broadcom BCM43xx debugging (RECOMMENDED)"

	depends on BCM43XX

	default y

	---help---

	  Broadcom 43xx debugging messages.

	  Say Y, because the driver is still very experimental and

	  this will help you get it running.



config BCM43XX_DMA

	bool

config BCM43XX_PIO

	bool



choice

	prompt "BCM43xx data transfer mode"

	depends on BCM43XX

	default BCM43XX_DMA_AND_PIO_MODE



config BCM43XX_DMA_AND_PIO_MODE

	bool "DMA + PIO"

	select BCM43XX_DMA

	select BCM43XX_PIO

	---help---

	  Include both, Direct Memory Access (DMA) and Programmed I/O (PIO)

	  data transfer modes.

	  The actually used mode is selectable through the module

	  parameter "pio". If the module parameter is pio=0, DMA is used.

	  Otherwise PIO is used. DMA is default.



	  If unsure, choose this option.



config BCM43XX_DMA_MODE

	bool "DMA (Direct Memory Access) only"

	select BCM43XX_DMA

	---help---

	  Only include Direct Memory Access (DMA).

	  This reduces the size of the driver module, by omitting the PIO code.



config BCM43XX_PIO_MODE

	bool "PIO (Programmed I/O) only"

	select BCM43XX_PIO

	---help---

	  Only include Programmed I/O (PIO).

	  This reduces the size of the driver module, by omitting the DMA code.

	  Please note that PIO transfers are slow (compared to DMA).



	  Also note that not all devices of the 43xx series support PIO.

	  The 4306 (Apple Airport Extreme and others) supports PIO, while

	  the 4318 is known to _not_ support PIO.



	  Only use PIO, if DMA does not work for you.



endchoice

drivers/net/wireless/bcm43xx/Makefile

0 → 100644
+12 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_BCM43XX) += bcm43xx.o

bcm43xx-obj-$(CONFIG_BCM43XX_DEBUG) += bcm43xx_debugfs.o



bcm43xx-obj-$(CONFIG_BCM43XX_DMA) += bcm43xx_dma.o

bcm43xx-obj-$(CONFIG_BCM43XX_PIO) += bcm43xx_pio.o



bcm43xx-objs := bcm43xx_main.o bcm43xx_ilt.o \

		bcm43xx_radio.o bcm43xx_phy.o \

		bcm43xx_power.o bcm43xx_wx.o \

		bcm43xx_leds.o bcm43xx_ethtool.o \

		bcm43xx_xmit.o bcm43xx_sysfs.o \

		$(bcm43xx-obj-y)