Commit dc5a1894 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge Linus's tree into staging-next 



This was done to resolve the conflicts that were in a number of files
due to changes done upstream with others done in the staging-next
branch.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parents 461df4de c7732987

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -1533,9 +1533,10 @@ F: drivers/net/tg3.* 
BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER

M:	Brett Rudley <brudley@broadcom.com>

M:	Henry Ptasinski <henryp@broadcom.com>

M:	Dowan Kim <dowan@broadcom.com>

M:	Roland Vossen <rvossen@broadcom.com>

M:	Arend van Spriel <arend@broadcom.com>

M:	Franky (Zhenhui) Lin <frankyl@broadcom.com>

M:	Kan Yan	<kanyan@broadcom.com>

L:	linux-wireless@vger.kernel.org

S:	Supported

F:	drivers/staging/brcm80211/

drivers/staging/brcm80211/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ config BRCMSMAC 
	default n

	depends on PCI

	depends on WLAN && MAC80211

	depends on !PPC64 && !PPC32

	select BRCMUTIL

	select FW_LOADER

	select CRC_CCITT
@@ -20,6 +21,7 @@ config BRCMFMAC 
	default n

	depends on MMC

	depends on WLAN && CFG80211

	depends on !PPC64 && !PPC32

	select BRCMUTIL

	select FW_LOADER

	select WIRELESS_EXT

drivers/staging/brcm80211/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ 
subdir-ccflags-y					:= -DBCMDMA32

subdir-ccflags-$(CONFIG_BRCMDBG)	+= -DBCMDBG -DBCMDBG_ASSERT



obj-$(CONFIG_BRCMUTIL)	+= util/

obj-$(CONFIG_BRCMUTIL)	+= brcmutil/

obj-$(CONFIG_BRCMFMAC)	+= brcmfmac/

obj-$(CONFIG_BRCMSMAC)	+= brcmsmac/

drivers/staging/brcm80211/README

+1 −64
Original line number Diff line number Diff line 
Broadcom brcmsmac (mac80211-based softmac PCIe) and brcmfmac (SDIO) drivers.



Completely open source host drivers, no binary object files.



Support for the following chips:

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



    brcmsmac (PCIe)

    Name        Device ID

    BCM4313     0x4727

    BCM43224    0x4353

    BCM43225    0x4357



    brcmfmac (SDIO)

    Name

    BCM4329



Both brcmsmac and brcmfmac drivers require firmware files that need to be

separately downloaded.



Firmware

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

Firmware is available from the Linux firmware repository at:



    git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git

    http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git

    https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git





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

Broadcom brcmsmac driver

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

- Support for both 32 and 64 bit Linux kernels





Firmware installation

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

Copy brcm/bcm43xx-0.fw and brcm/bcm43xx_hdr-0.fw to

/lib/firmware/brcm (or wherever firmware is normally installed

on your system).





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

Broadcom brcmfmac driver

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

- Support for 32 bit Linux kernel, 64 bit untested





Firmware installation

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

Copy brcm/bcm4329-fullmac-4.bin and brcm/bcm4329-fullmac-4.txt

to /lib/firmware/brcm (or wherever firmware is normally installed on your

system).





Contact Info:

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

Brett Rudley		brudley@broadcom.com

Henry Ptasinski		henryp@broadcom.com

Dowan Kim		dowan@broadcom.com

Roland Vossen		rvossen@broadcom.com

Arend van Spriel	arend@broadcom.com



For more info, refer to: http://linuxwireless.org/en/users/Drivers/brcm80211
 
refer to: http://linuxwireless.org/en/users/Drivers/brcm80211

drivers/staging/brcm80211/TODO

+11 −3
Original line number Diff line number Diff line
@@ -2,14 +2,22 @@ To Do List for Broadcom Mac80211 driver before getting in mainline 


Bugs

====

- Oops on AMPDU traffic, to be solved by new ucode (currently under test)

- none known at this moment



brcmfmac and brcmsmac

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

- ASSERTS not allowed in mainline, replace by warning + error handling

- Replace printk and WL_ERROR() with proper routines

- replace company specific acronym wlc_

- Resolve all XXX, TODO, FIXME in code



brcmfmac

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

- Remove unnecessary includes, move #includes from .h files into .c files.

- Absorb and delete header files that are included in only one .c file

- ASSERTS not allowed in mainline, replace by warning + error handling

- Replace printk and WL_ERROR() with proper routines

- Replace driver's proprietary ssb interface with generic kernel ssb module

- Build and test on 64 bit linux kernel



brcm80211 info page

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

http://linuxwireless.org/en/users/Drivers/brcm80211