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

Commit 5b435de0 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

net: wireless: add brcm80211 drivers 



Add the brcm80211 tree to drivers/net/wireless, and disable the version that's
in drivers/staging.  This version includes the sources currently in staging,
plus any changes that have been sent out for review.

Sources in staging will be deleted in a followup patch.

Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5f68a2b0

drivers/net/wireless/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ config MWL8K 
source "drivers/net/wireless/ath/Kconfig"

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

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

source "drivers/net/wireless/brcm80211/Kconfig"

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

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

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

drivers/net/wireless/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -58,3 +58,6 @@ obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wl12xx/ 
obj-$(CONFIG_IWM)	+= iwmc3200wifi/



obj-$(CONFIG_MWIFIEX)	+= mwifiex/

obj-$(CONFIG_BRCMFMAC) += brcm80211/

obj-$(CONFIG_BRCMUMAC) += brcm80211/

obj-$(CONFIG_BRCMSMAC) += brcm80211/

drivers/net/wireless/brcm80211/Kconfig

0 → 100644
+35 −0
Original line number Diff line number Diff line 
config BRCMUTIL

	tristate



config BRCMSMAC

	tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver"

	depends on PCI

	depends on MAC80211

	depends on BCMA=n

	select BRCMUTIL

	select FW_LOADER

	select CRC_CCITT

	select CRC8

	select CORDIC

	---help---

	  This module adds support for PCIe wireless adapters based on Broadcom

	  IEEE802.11n SoftMAC chipsets.  If you choose to build a module, it'll

	  be called brcmsmac.ko.



config BRCMFMAC

	tristate "Broadcom IEEE802.11n embedded FullMAC WLAN driver"

	depends on MMC

	depends on CFG80211

	select BRCMUTIL

	select FW_LOADER

	---help---

	  This module adds support for embedded wireless adapters based on

	  Broadcom IEEE802.11n FullMAC chipsets.  This driver uses the kernel's

	  wireless extensions subsystem.  If you choose to build a module,

	  it'll be called brcmfmac.ko.



config BRCMDBG

	bool "Broadcom driver debug functions"

	depends on BRCMSMAC || BRCMFMAC

	---help---

	  Selecting this enables additional code for debug purposes.

drivers/net/wireless/brcm80211/Makefile

0 → 100644
+23 −0
Original line number Diff line number Diff line 
#

# Makefile fragment for Broadcom 802.11n Networking Device Driver

#

# Copyright (c) 2010 Broadcom Corporation

#

# Permission to use, copy, modify, and/or distribute this software for any

# purpose with or without fee is hereby granted, provided that the above

# copyright notice and this permission notice appear in all copies.

#

# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY

# SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION

# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.



# common flags

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



obj-$(CONFIG_BRCMUTIL)	+= brcmutil/

obj-$(CONFIG_BRCMFMAC)	+= brcmfmac/

obj-$(CONFIG_BRCMSMAC)	+= brcmsmac/

drivers/net/wireless/brcm80211/brcmfmac/Makefile

0 → 100644
+33 −0
Original line number Diff line number Diff line 
#

# Makefile fragment for Broadcom 802.11n Networking Device Driver

#

# Copyright (c) 2010 Broadcom Corporation

#

# Permission to use, copy, modify, and/or distribute this software for any

# purpose with or without fee is hereby granted, provided that the above

# copyright notice and this permission notice appear in all copies.

#

# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY

# SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION

# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.



ccflags-y += \

	-Idrivers/net/wireless/brcm80211/brcmfmac	\

	-Idrivers/net/wireless/brcm80211/include



DHDOFILES = \

	wl_cfg80211.o \

	dhd_cdc.o \

	dhd_common.o \

	dhd_sdio.o	\

	dhd_linux.o \

	bcmsdh.o \

	bcmsdh_sdmmc.o



obj-$(CONFIG_BRCMFMAC) += brcmfmac.o

brcmfmac-objs += $(DHDOFILES)

ccflags-y += -D__CHECK_ENDIAN__