diff options
author | Arend van Spriel <arend@broadcom.com> | 2011-01-21 10:54:48 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-21 11:58:06 -0800 |
commit | f8559b6920b435028ec9aed62846906bb20e47d8 (patch) | |
tree | 47e8942332059197634f25d5c49295566b225478 | |
parent | a57d188daa8cd2867e6d8eca8d7cc7a8f5dcf628 (diff) | |
download | linux-f8559b6920b435028ec9aed62846906bb20e47d8.tar.bz2 |
staging: brcm80211: moved code around for cleanup
Restructured code to have more consistent directory tree for the
two drivers.
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Reviewed-by: Henry Ptasinski <henryp@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/brcm80211/Kconfig | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/Makefile | 61 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/Kconfig | 15 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/Makefile | 24 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/Makefile | 67 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_version.h (renamed from drivers/staging/brcm80211/phy/phy_version.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c (renamed from drivers/staging/brcm80211/phy/wlc_phy_cmn.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h (renamed from drivers/staging/brcm80211/phy/wlc_phy_hal.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h (renamed from drivers/staging/brcm80211/phy/wlc_phy_int.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c (renamed from drivers/staging/brcm80211/phy/wlc_phy_lcn.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.h (renamed from drivers/staging/brcm80211/phy/wlc_phy_lcn.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c (renamed from drivers/staging/brcm80211/phy/wlc_phy_n.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_radio.h (renamed from drivers/staging/brcm80211/phy/wlc_phy_radio.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/wlc_phyreg_n.h (renamed from drivers/staging/brcm80211/phy/wlc_phyreg_n.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c (renamed from drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.h (renamed from drivers/staging/brcm80211/phy/wlc_phytbl_lcn.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c (renamed from drivers/staging/brcm80211/phy/wlc_phytbl_n.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.h (renamed from drivers/staging/brcm80211/phy/wlc_phytbl_n.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/d11ucode_ext.h (renamed from drivers/staging/brcm80211/sys/d11ucode_ext.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wl_dbg.h (renamed from drivers/staging/brcm80211/sys/wl_dbg.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wl_export.h (renamed from drivers/staging/brcm80211/sys/wl_export.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wl_mac80211.c (renamed from drivers/staging/brcm80211/sys/wl_mac80211.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wl_mac80211.h (renamed from drivers/staging/brcm80211/sys/wl_mac80211.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wl_ucode.h (renamed from drivers/staging/brcm80211/sys/wl_ucode.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wl_ucode_loader.c (renamed from drivers/staging/brcm80211/sys/wl_ucode_loader.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_alloc.c (renamed from drivers/staging/brcm80211/sys/wlc_alloc.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_alloc.h (renamed from drivers/staging/brcm80211/sys/wlc_alloc.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_ampdu.c (renamed from drivers/staging/brcm80211/sys/wlc_ampdu.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_ampdu.h (renamed from drivers/staging/brcm80211/sys/wlc_ampdu.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_antsel.c (renamed from drivers/staging/brcm80211/sys/wlc_antsel.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_antsel.h (renamed from drivers/staging/brcm80211/sys/wlc_antsel.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_bmac.c (renamed from drivers/staging/brcm80211/sys/wlc_bmac.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_bmac.h (renamed from drivers/staging/brcm80211/sys/wlc_bmac.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_bsscfg.h (renamed from drivers/staging/brcm80211/sys/wlc_bsscfg.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_cfg.h (renamed from drivers/staging/brcm80211/sys/wlc_cfg.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_channel.c (renamed from drivers/staging/brcm80211/sys/wlc_channel.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_channel.h (renamed from drivers/staging/brcm80211/sys/wlc_channel.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_event.c (renamed from drivers/staging/brcm80211/sys/wlc_event.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_event.h (renamed from drivers/staging/brcm80211/sys/wlc_event.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_key.h (renamed from drivers/staging/brcm80211/sys/wlc_key.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_mac80211.c (renamed from drivers/staging/brcm80211/sys/wlc_mac80211.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_mac80211.h (renamed from drivers/staging/brcm80211/sys/wlc_mac80211.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_phy_shim.c (renamed from drivers/staging/brcm80211/sys/wlc_phy_shim.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_phy_shim.h (renamed from drivers/staging/brcm80211/sys/wlc_phy_shim.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_pub.h (renamed from drivers/staging/brcm80211/sys/wlc_pub.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_rate.c (renamed from drivers/staging/brcm80211/sys/wlc_rate.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_rate.h (renamed from drivers/staging/brcm80211/sys/wlc_rate.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_scb.h (renamed from drivers/staging/brcm80211/sys/wlc_scb.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_stf.c (renamed from drivers/staging/brcm80211/sys/wlc_stf.c) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_stf.h (renamed from drivers/staging/brcm80211/sys/wlc_stf.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/sys/wlc_types.h (renamed from drivers/staging/brcm80211/sys/wlc_types.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/include/bcmsdh.h | 1 | ||||
-rw-r--r-- | drivers/staging/brcm80211/util/aiutils.c | 3 | ||||
-rw-r--r-- | drivers/staging/brcm80211/util/bcmwifi.c | 3 | ||||
-rw-r--r-- | drivers/staging/brcm80211/util/hndpmu.c | 3 | ||||
-rw-r--r-- | drivers/staging/brcm80211/util/siutils.c | 3 |
56 files changed, 92 insertions, 92 deletions
diff --git a/drivers/staging/brcm80211/Kconfig b/drivers/staging/brcm80211/Kconfig index 57d2d1b782f1..3208352465af 100644 --- a/drivers/staging/brcm80211/Kconfig +++ b/drivers/staging/brcm80211/Kconfig @@ -8,7 +8,7 @@ choice help Select the appropriate driver style from the list below. -config BRCM80211_PCI +config BRCMSMAC bool "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver" depends on PCI depends on BRCM80211 && MAC80211 @@ -16,7 +16,7 @@ config BRCM80211_PCI ---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 brcm80211.ko. + be called brcmsmac.ko. config BRCMFMAC bool "Broadcom IEEE802.11n embedded FullMAC WLAN driver" diff --git a/drivers/staging/brcm80211/Makefile b/drivers/staging/brcm80211/Makefile index 1953ebe3d64b..a0695195614f 100644 --- a/drivers/staging/brcm80211/Makefile +++ b/drivers/staging/brcm80211/Makefile @@ -15,62 +15,5 @@ # OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -ccflags-y := \ - -DBCMDBG \ - -DWLC_HIGH \ - -DSTA \ - -DWME \ - -DWL11N \ - -DDBAND \ - -DBCMDMA32 \ - -DBCMNVRAMR \ - -Idrivers/staging/brcm80211/sys \ - -Idrivers/staging/brcm80211/phy \ - -Idrivers/staging/brcm80211/util \ - -Idrivers/staging/brcm80211/include - -PCI_CFLAGS := -DWLC_LOW - -BRCM80211_OFILES := \ - util/siutils.o \ - util/aiutils.o \ - util/bcmotp.o \ - util/bcmsrom.o \ - util/bcmutils.o \ - util/bcmwifi.o \ - util/hndpmu.o \ - util/linux_osl.o \ - sys/wlc_alloc.o \ - sys/wlc_antsel.o \ - sys/wlc_channel.o \ - sys/wlc_event.o \ - sys/wlc_mac80211.o \ - sys/wlc_rate.o \ - sys/wlc_stf.o \ - sys/wl_mac80211.o \ - sys/wlc_ampdu.o - -PCIFILES := \ - phy/wlc_phy_cmn.o \ - phy/wlc_phy_lcn.o \ - phy/wlc_phy_n.o \ - phy/wlc_phytbl_lcn.o \ - phy/wlc_phytbl_n.o \ - sys/wlc_bmac.o \ - sys/wlc_phy_shim.o \ - sys/wl_ucode_loader.o \ - util/hnddma.o \ - util/nicpci.o \ - util/nvram/nvram_ro.o \ - util/qmath.o - -MODULEPFX := brcm80211 - -# PCI driver -ifeq ($(CONFIG_BRCM80211_PCI),y) -obj-m += $(MODULEPFX).o -ccflags-y += $(PCI_CFLAGS) -$(MODULEPFX)-objs = $(BRCM80211_OFILES) $(PCIFILES) -endif - -obj-$(CONFIG_BRCMFMAC) += brcmfmac/ +obj-$(CONFIG_BRCMFMAC) += brcmfmac/ +obj-$(CONFIG_BRCMSMAC) += brcmsmac/ diff --git a/drivers/staging/brcm80211/brcmfmac/Kconfig b/drivers/staging/brcm80211/brcmfmac/Kconfig deleted file mode 100644 index e9f3037b0876..000000000000 --- a/drivers/staging/brcm80211/brcmfmac/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -menuconfig BRCMFMAC - tristate "Broadcom fullmac wireless cards support" - depends on MMC - depends on CFG80211 - select FW_LOADER - select WIRELESS_EXT - select WEXT_PRIV - ---help--- - This module adds support for wireless adapters based on - Broadcom fullmac chipsets. - This driver uses the kernel's wireless extensions subsystem. - If you choose to build a module, it'll be called brcmfmac.ko. Say M if - unsure. - - diff --git a/drivers/staging/brcm80211/brcmfmac/Makefile b/drivers/staging/brcm80211/brcmfmac/Makefile index 76f2d8b37e45..13df7c3c79d3 100644 --- a/drivers/staging/brcm80211/brcmfmac/Makefile +++ b/drivers/staging/brcm80211/brcmfmac/Makefile @@ -37,10 +37,26 @@ ccflags-y := \ -Idrivers/staging/brcm80211/include \ -Idrivers/staging/brcm80211/util -DHDOFILES = dhd_linux.o ../util/linux_osl.o ../util/bcmutils.o dhd_common.o dhd_custom_gpio.o \ - wl_iw.o wl_cfg80211.o ../util/siutils.o ../util/sbutils.o ../util/aiutils.o ../util/hndpmu.o ../util/bcmwifi.o dhd_sdio.o \ - dhd_linux_sched.o dhd_cdc.o bcmsdh_sdmmc.o bcmsdh.o bcmsdh_linux.o \ - bcmsdh_sdmmc_linux.o +DHDOFILES = \ + wl_cfg80211.o \ + wl_iw.o \ + dhd_cdc.o \ + dhd_common.o \ + dhd_custom_gpio.o \ + dhd_sdio.o \ + dhd_linux.o \ + dhd_linux_sched.o \ + bcmsdh.o \ + bcmsdh_linux.o \ + bcmsdh_sdmmc.o \ + bcmsdh_sdmmc_linux.o \ + ../util/linux_osl.o \ + ../util/aiutils.o \ + ../util/siutils.o \ + ../util/sbutils.o \ + ../util/bcmutils.o \ + ../util/bcmwifi.o \ + ../util/hndpmu.o obj-m += brcmfmac.o brcmfmac-objs += $(DHDOFILES) diff --git a/drivers/staging/brcm80211/brcmsmac/Makefile b/drivers/staging/brcm80211/brcmsmac/Makefile new file mode 100644 index 000000000000..910196a37353 --- /dev/null +++ b/drivers/staging/brcm80211/brcmsmac/Makefile @@ -0,0 +1,67 @@ +# +# 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 := \ + -DBCMDBG \ + -DWLC_HIGH \ + -DWLC_LOW \ + -DSTA \ + -DWME \ + -DWL11N \ + -DDBAND \ + -DBCMDMA32 \ + -DBCMNVRAMR \ + -Idrivers/staging/brcm80211/brcmsmac/sys \ + -Idrivers/staging/brcm80211/brcmsmac/phy \ + -Idrivers/staging/brcm80211/util \ + -Idrivers/staging/brcm80211/include + +BRCMSMAC_OFILES := \ + sys/wl_mac80211.o \ + sys/wl_ucode_loader.o \ + sys/wlc_alloc.o \ + sys/wlc_ampdu.o \ + sys/wlc_antsel.o \ + sys/wlc_bmac.o \ + sys/wlc_channel.o \ + sys/wlc_event.o \ + sys/wlc_mac80211.o \ + sys/wlc_phy_shim.o \ + sys/wlc_rate.o \ + sys/wlc_stf.o \ + phy/wlc_phy_cmn.o \ + phy/wlc_phy_lcn.o \ + phy/wlc_phy_n.o \ + phy/wlc_phytbl_lcn.o \ + phy/wlc_phytbl_n.o \ + ../util/linux_osl.o \ + ../util/aiutils.o \ + ../util/siutils.o \ + ../util/bcmutils.o \ + ../util/bcmwifi.o \ + ../util/bcmotp.o \ + ../util/bcmsrom.o \ + ../util/hnddma.o \ + ../util/hndpmu.o \ + ../util/nicpci.o \ + ../util/qmath.o \ + ../util/nvram/nvram_ro.o + +MODULEPFX := brcmsmac + +obj-m += $(MODULEPFX).o +$(MODULEPFX)-objs = $(BRCMSMAC_OFILES) diff --git a/drivers/staging/brcm80211/phy/phy_version.h b/drivers/staging/brcm80211/brcmsmac/phy/phy_version.h index 51a223880bcf..51a223880bcf 100644 --- a/drivers/staging/brcm80211/phy/phy_version.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_version.h diff --git a/drivers/staging/brcm80211/phy/wlc_phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c index 3bed37cb59b8..3bed37cb59b8 100644 --- a/drivers/staging/brcm80211/phy/wlc_phy_cmn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c diff --git a/drivers/staging/brcm80211/phy/wlc_phy_hal.h b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h index 514e15e00283..514e15e00283 100644 --- a/drivers/staging/brcm80211/phy/wlc_phy_hal.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h diff --git a/drivers/staging/brcm80211/phy/wlc_phy_int.h b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h index 72eee9120c2f..72eee9120c2f 100644 --- a/drivers/staging/brcm80211/phy/wlc_phy_int.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h diff --git a/drivers/staging/brcm80211/phy/wlc_phy_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c index 3ac2b49d9a9d..3ac2b49d9a9d 100644 --- a/drivers/staging/brcm80211/phy/wlc_phy_lcn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c diff --git a/drivers/staging/brcm80211/phy/wlc_phy_lcn.h b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.h index b7bfc7230dfc..b7bfc7230dfc 100644 --- a/drivers/staging/brcm80211/phy/wlc_phy_lcn.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.h diff --git a/drivers/staging/brcm80211/phy/wlc_phy_n.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c index c6cce8de1aee..c6cce8de1aee 100644 --- a/drivers/staging/brcm80211/phy/wlc_phy_n.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c diff --git a/drivers/staging/brcm80211/phy/wlc_phy_radio.h b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_radio.h index 72176ae2882c..72176ae2882c 100644 --- a/drivers/staging/brcm80211/phy/wlc_phy_radio.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_radio.h diff --git a/drivers/staging/brcm80211/phy/wlc_phyreg_n.h b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phyreg_n.h index 211bc3a842af..211bc3a842af 100644 --- a/drivers/staging/brcm80211/phy/wlc_phyreg_n.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phyreg_n.h diff --git a/drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c index 330b88152b65..330b88152b65 100644 --- a/drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c diff --git a/drivers/staging/brcm80211/phy/wlc_phytbl_lcn.h b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.h index 5a64a988d107..5a64a988d107 100644 --- a/drivers/staging/brcm80211/phy/wlc_phytbl_lcn.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.h diff --git a/drivers/staging/brcm80211/phy/wlc_phytbl_n.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c index a9fc193721ef..a9fc193721ef 100644 --- a/drivers/staging/brcm80211/phy/wlc_phytbl_n.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c diff --git a/drivers/staging/brcm80211/phy/wlc_phytbl_n.h b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.h index 396122f5e50b..396122f5e50b 100644 --- a/drivers/staging/brcm80211/phy/wlc_phytbl_n.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.h diff --git a/drivers/staging/brcm80211/sys/d11ucode_ext.h b/drivers/staging/brcm80211/brcmsmac/sys/d11ucode_ext.h index c0c0d661e00e..c0c0d661e00e 100644 --- a/drivers/staging/brcm80211/sys/d11ucode_ext.h +++ b/drivers/staging/brcm80211/brcmsmac/sys/d11ucode_ext.h diff --git a/drivers/staging/brcm80211/sys/wl_dbg.h b/drivers/staging/brcm80211/brcmsmac/sys/wl_dbg.h index 54af257598c2..54af257598c2 100644 --- a/drivers/staging/brcm80211/sys/wl_dbg.h +++ b/drivers/staging/brcm80211/brcmsmac/sys/wl_dbg.h diff --git a/drivers/staging/brcm80211/sys/wl_export.h b/drivers/staging/brcm80211/brcmsmac/sys/wl_export.h index aa8b5a3ed633..aa8b5a3ed633 100644 --- a/drivers/staging/brcm80211/sys/wl_export.h +++ b/drivers/staging/brcm80211/brcmsmac/sys/wl_export.h diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/sys/wl_mac80211.c index 6bc6207bab3e..6bc6207bab3e 100644 --- a/drivers/staging/brcm80211/sys/wl_mac80211.c +++ b/drivers/staging/brcm80211/brcmsmac/sys/wl_mac80211.c diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.h b/drivers/staging/brcm80211/brcmsmac/sys/wl_mac80211.h index bb39b7705947..bb39b7705947 100644 --- a/drivers/staging/brcm80211/sys/wl_mac80211.h +++ b/drivers/staging/brcm80211/brcmsmac/sys/wl_mac80211.h diff --git a/drivers/staging/brcm80211/sys/wl_ucode.h b/drivers/staging/brcm80211/brcmsmac/sys/wl_ucode.h index 2a0f4028f6f3..2a0f4028f6f3 100644 --- a/drivers/staging/brcm80211/sys/wl_ucode.h +++ b/drivers/staging/brcm80211/brcmsmac/sys/wl_ucode.h diff --git a/drivers/staging/brcm80211/sys/wl_ucode_loader.c b/drivers/staging/brcm80211/brcmsmac/sys/wl_ucode_loader.c index 23e10f3dec0d..23e10f3dec0d 100644 --- a/drivers/staging/brcm80211/sys/wl_ucode_loader.c +++ b/drivers/staging/brcm80211/brcmsmac/sys/wl_ucode_loader.c diff --git a/drivers/staging/brcm80211/sys/wlc_alloc.c b/drivers/staging/brcm80211/brcmsmac/sys/wlc_alloc.c index 7a9fdbb5daee..7a9fdbb5daee 100644 --- a/drivers/staging/brcm80211/sys/wlc_alloc.c +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_alloc.c diff --git a/drivers/staging/brcm80211/sys/wlc_alloc.h b/drivers/staging/brcm80211/brcmsmac/sys/wlc_alloc.h index ac34f782b400..ac34f782b400 100644 --- a/drivers/staging/brcm80211/sys/wlc_alloc.h +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_alloc.h diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/sys/wlc_ampdu.c index 8e1011203481..8e1011203481 100644 --- a/drivers/staging/brcm80211/sys/wlc_ampdu.c +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_ampdu.c diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.h b/drivers/staging/brcm80211/brcmsmac/sys/wlc_ampdu.h index 03457f63f2ab..03457f63f2ab 100644 --- a/drivers/staging/brcm80211/sys/wlc_ampdu.h +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_ampdu.h diff --git a/drivers/staging/brcm80211/sys/wlc_antsel.c b/drivers/staging/brcm80211/brcmsmac/sys/wlc_antsel.c index 402ddf8f3371..402ddf8f3371 100644 --- a/drivers/staging/brcm80211/sys/wlc_antsel.c +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_antsel.c diff --git a/drivers/staging/brcm80211/sys/wlc_antsel.h b/drivers/staging/brcm80211/brcmsmac/sys/wlc_antsel.h index 8875b5848665..8875b5848665 100644 --- a/drivers/staging/brcm80211/sys/wlc_antsel.h +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_antsel.h diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/sys/wlc_bmac.c index e22ce1f79660..e22ce1f79660 100644 --- a/drivers/staging/brcm80211/sys/wlc_bmac.c +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_bmac.c diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.h b/drivers/staging/brcm80211/brcmsmac/sys/wlc_bmac.h index 03ce9521d652..03ce9521d652 100644 --- a/drivers/staging/brcm80211/sys/wlc_bmac.h +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_bmac.h diff --git a/drivers/staging/brcm80211/sys/wlc_bsscfg.h b/drivers/staging/brcm80211/brcmsmac/sys/wlc_bsscfg.h index 0bb4a212dd71..0bb4a212dd71 100644 --- a/drivers/staging/brcm80211/sys/wlc_bsscfg.h +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_bsscfg.h diff --git a/drivers/staging/brcm80211/sys/wlc_cfg.h b/drivers/staging/brcm80211/brcmsmac/sys/wlc_cfg.h index 3decb7d1a5e5..3decb7d1a5e5 100644 --- a/drivers/staging/brcm80211/sys/wlc_cfg.h +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_cfg.h diff --git a/drivers/staging/brcm80211/sys/wlc_channel.c b/drivers/staging/brcm80211/brcmsmac/sys/wlc_channel.c index a35c15214880..a35c15214880 100644 --- a/drivers/staging/brcm80211/sys/wlc_channel.c +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_channel.c diff --git a/drivers/staging/brcm80211/sys/wlc_channel.h b/drivers/staging/brcm80211/brcmsmac/sys/wlc_channel.h index 1f170aff68fd..1f170aff68fd 100644 --- a/drivers/staging/brcm80211/sys/wlc_channel.h +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_channel.h diff --git a/drivers/staging/brcm80211/sys/wlc_event.c b/drivers/staging/brcm80211/brcmsmac/sys/wlc_event.c index dabd7094cd73..dabd7094cd73 100644 --- a/drivers/staging/brcm80211/sys/wlc_event.c +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_event.c diff --git a/drivers/staging/brcm80211/sys/wlc_event.h b/drivers/staging/brcm80211/brcmsmac/sys/wlc_event.h index e75582dcdd93..e75582dcdd93 100644 --- a/drivers/staging/brcm80211/sys/wlc_event.h +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_event.h diff --git a/drivers/staging/brcm80211/sys/wlc_key.h b/drivers/staging/brcm80211/brcmsmac/sys/wlc_key.h index 3e23d5145919..3e23d5145919 100644 --- a/drivers/staging/brcm80211/sys/wlc_key.h +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_key.h diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/brcmsmac/sys/wlc_mac80211.c index 5eb41d64bc23..5eb41d64bc23 100644 --- a/drivers/staging/brcm80211/sys/wlc_mac80211.c +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_mac80211.c diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.h b/drivers/staging/brcm80211/brcmsmac/sys/wlc_mac80211.h index f56b58141c09..f56b58141c09 100644 --- a/drivers/staging/brcm80211/sys/wlc_mac80211.h +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_mac80211.h diff --git a/drivers/staging/brcm80211/sys/wlc_phy_shim.c b/drivers/staging/brcm80211/brcmsmac/sys/wlc_phy_shim.c index 8bd4ede4c92a..8bd4ede4c92a 100644 --- a/drivers/staging/brcm80211/sys/wlc_phy_shim.c +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_phy_shim.c diff --git a/drivers/staging/brcm80211/sys/wlc_phy_shim.h b/drivers/staging/brcm80211/brcmsmac/sys/wlc_phy_shim.h index c151a5d8c693..c151a5d8c693 100644 --- a/drivers/staging/brcm80211/sys/wlc_phy_shim.h +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_phy_shim.h diff --git a/drivers/staging/brcm80211/sys/wlc_pub.h b/drivers/staging/brcm80211/brcmsmac/sys/wlc_pub.h index 23e99685d548..23e99685d548 100644 --- a/drivers/staging/brcm80211/sys/wlc_pub.h +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_pub.h diff --git a/drivers/staging/brcm80211/sys/wlc_rate.c b/drivers/staging/brcm80211/brcmsmac/sys/wlc_rate.c index ab7d0bed3c0a..ab7d0bed3c0a 100644 --- a/drivers/staging/brcm80211/sys/wlc_rate.c +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_rate.c diff --git a/drivers/staging/brcm80211/sys/wlc_rate.h b/drivers/staging/brcm80211/brcmsmac/sys/wlc_rate.h index 25ba2a423639..25ba2a423639 100644 --- a/drivers/staging/brcm80211/sys/wlc_rate.h +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_rate.h diff --git a/drivers/staging/brcm80211/sys/wlc_scb.h b/drivers/staging/brcm80211/brcmsmac/sys/wlc_scb.h index 142b75674444..142b75674444 100644 --- a/drivers/staging/brcm80211/sys/wlc_scb.h +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_scb.h diff --git a/drivers/staging/brcm80211/sys/wlc_stf.c b/drivers/staging/brcm80211/brcmsmac/sys/wlc_stf.c index 10c9f447cdf0..10c9f447cdf0 100644 --- a/drivers/staging/brcm80211/sys/wlc_stf.c +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_stf.c diff --git a/drivers/staging/brcm80211/sys/wlc_stf.h b/drivers/staging/brcm80211/brcmsmac/sys/wlc_stf.h index 8de6382e620d..8de6382e620d 100644 --- a/drivers/staging/brcm80211/sys/wlc_stf.h +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_stf.h diff --git a/drivers/staging/brcm80211/sys/wlc_types.h b/drivers/staging/brcm80211/brcmsmac/sys/wlc_types.h index df6e04c6ac58..df6e04c6ac58 100644 --- a/drivers/staging/brcm80211/sys/wlc_types.h +++ b/drivers/staging/brcm80211/brcmsmac/sys/wlc_types.h diff --git a/drivers/staging/brcm80211/include/bcmsdh.h b/drivers/staging/brcm80211/include/bcmsdh.h index 0e1f79919c9c..90a600de7a3a 100644 --- a/drivers/staging/brcm80211/include/bcmsdh.h +++ b/drivers/staging/brcm80211/include/bcmsdh.h @@ -17,6 +17,7 @@ #ifndef _bcmsdh_h_ #define _bcmsdh_h_ +#include <linux/skbuff.h> #define BCMSDH_ERROR_VAL 0x0001 /* Error */ #define BCMSDH_INFO_VAL 0x0002 /* Info */ extern const uint bcmsdh_msglevel; diff --git a/drivers/staging/brcm80211/util/aiutils.c b/drivers/staging/brcm80211/util/aiutils.c index ddd2f9d64c20..b6e7a9e97379 100644 --- a/drivers/staging/brcm80211/util/aiutils.c +++ b/drivers/staging/brcm80211/util/aiutils.c @@ -18,9 +18,6 @@ #include <linux/kernel.h> #include <linux/string.h> #include <bcmdefs.h> -#ifdef BRCM_FULLMAC -#include <linux/netdevice.h> -#endif #include <osl.h> #include <linux/module.h> #include <linux/pci.h> diff --git a/drivers/staging/brcm80211/util/bcmwifi.c b/drivers/staging/brcm80211/util/bcmwifi.c index cb6f21ae36cc..b22d14b9aef4 100644 --- a/drivers/staging/brcm80211/util/bcmwifi.c +++ b/drivers/staging/brcm80211/util/bcmwifi.c @@ -15,9 +15,6 @@ */ #include <linux/ctype.h> #include <linux/kernel.h> -#ifdef BRCM_FULLMAC -#include <linux/netdevice.h> -#endif #include <osl.h> #include <bcmdefs.h> #include <bcmutils.h> diff --git a/drivers/staging/brcm80211/util/hndpmu.c b/drivers/staging/brcm80211/util/hndpmu.c index 6cc59a895868..49d19a121f7b 100644 --- a/drivers/staging/brcm80211/util/hndpmu.c +++ b/drivers/staging/brcm80211/util/hndpmu.c @@ -18,9 +18,6 @@ #include <linux/string.h> #include <linux/module.h> #include <linux/pci.h> -#ifdef BRCM_FULLMAC -#include <linux/netdevice.h> -#endif #include <bcmdefs.h> #include <osl.h> #include <bcmutils.h> diff --git a/drivers/staging/brcm80211/util/siutils.c b/drivers/staging/brcm80211/util/siutils.c index b66de9b35a5a..b0e7695097e8 100644 --- a/drivers/staging/brcm80211/util/siutils.c +++ b/drivers/staging/brcm80211/util/siutils.c @@ -18,9 +18,6 @@ #include <linux/kernel.h> #include <linux/string.h> #include <bcmdefs.h> -#ifdef BRCM_FULLMAC -#include <linux/netdevice.h> -#endif #include <osl.h> #include <linux/module.h> #include <linux/pci.h> |