From f8559b6920b435028ec9aed62846906bb20e47d8 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Fri, 21 Jan 2011 10:54:48 +0100 Subject: [PATCH] staging: brcm80211: moved code around for cleanup Restructured code to have more consistent directory tree for the two drivers. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/Kconfig | 4 +- drivers/staging/brcm80211/Makefile | 61 +---------------- drivers/staging/brcm80211/brcmfmac/Kconfig | 15 ----- drivers/staging/brcm80211/brcmfmac/Makefile | 24 +++++-- drivers/staging/brcm80211/brcmsmac/Makefile | 67 +++++++++++++++++++ .../{ => brcmsmac}/phy/phy_version.h | 0 .../{ => brcmsmac}/phy/wlc_phy_cmn.c | 0 .../{ => brcmsmac}/phy/wlc_phy_hal.h | 0 .../{ => brcmsmac}/phy/wlc_phy_int.h | 0 .../{ => brcmsmac}/phy/wlc_phy_lcn.c | 0 .../{ => brcmsmac}/phy/wlc_phy_lcn.h | 0 .../brcm80211/{ => brcmsmac}/phy/wlc_phy_n.c | 0 .../{ => brcmsmac}/phy/wlc_phy_radio.h | 0 .../{ => brcmsmac}/phy/wlc_phyreg_n.h | 0 .../{ => brcmsmac}/phy/wlc_phytbl_lcn.c | 0 .../{ => brcmsmac}/phy/wlc_phytbl_lcn.h | 0 .../{ => brcmsmac}/phy/wlc_phytbl_n.c | 0 .../{ => brcmsmac}/phy/wlc_phytbl_n.h | 0 .../{ => brcmsmac}/sys/d11ucode_ext.h | 0 .../brcm80211/{ => brcmsmac}/sys/wl_dbg.h | 0 .../brcm80211/{ => brcmsmac}/sys/wl_export.h | 0 .../{ => brcmsmac}/sys/wl_mac80211.c | 0 .../{ => brcmsmac}/sys/wl_mac80211.h | 0 .../brcm80211/{ => brcmsmac}/sys/wl_ucode.h | 0 .../{ => brcmsmac}/sys/wl_ucode_loader.c | 0 .../brcm80211/{ => brcmsmac}/sys/wlc_alloc.c | 0 .../brcm80211/{ => brcmsmac}/sys/wlc_alloc.h | 0 .../brcm80211/{ => brcmsmac}/sys/wlc_ampdu.c | 0 .../brcm80211/{ => brcmsmac}/sys/wlc_ampdu.h | 0 .../brcm80211/{ => brcmsmac}/sys/wlc_antsel.c | 0 .../brcm80211/{ => brcmsmac}/sys/wlc_antsel.h | 0 .../brcm80211/{ => brcmsmac}/sys/wlc_bmac.c | 0 .../brcm80211/{ => brcmsmac}/sys/wlc_bmac.h | 0 .../brcm80211/{ => brcmsmac}/sys/wlc_bsscfg.h | 0 .../brcm80211/{ => brcmsmac}/sys/wlc_cfg.h | 0 .../{ => brcmsmac}/sys/wlc_channel.c | 0 .../{ => brcmsmac}/sys/wlc_channel.h | 0 .../brcm80211/{ => brcmsmac}/sys/wlc_event.c | 0 .../brcm80211/{ => brcmsmac}/sys/wlc_event.h | 0 .../brcm80211/{ => brcmsmac}/sys/wlc_key.h | 0 .../{ => brcmsmac}/sys/wlc_mac80211.c | 0 .../{ => brcmsmac}/sys/wlc_mac80211.h | 0 .../{ => brcmsmac}/sys/wlc_phy_shim.c | 0 .../{ => brcmsmac}/sys/wlc_phy_shim.h | 0 .../brcm80211/{ => brcmsmac}/sys/wlc_pub.h | 0 .../brcm80211/{ => brcmsmac}/sys/wlc_rate.c | 0 .../brcm80211/{ => brcmsmac}/sys/wlc_rate.h | 0 .../brcm80211/{ => brcmsmac}/sys/wlc_scb.h | 0 .../brcm80211/{ => brcmsmac}/sys/wlc_stf.c | 0 .../brcm80211/{ => brcmsmac}/sys/wlc_stf.h | 0 .../brcm80211/{ => brcmsmac}/sys/wlc_types.h | 0 drivers/staging/brcm80211/include/bcmsdh.h | 1 + drivers/staging/brcm80211/util/aiutils.c | 3 - drivers/staging/brcm80211/util/bcmwifi.c | 3 - drivers/staging/brcm80211/util/hndpmu.c | 3 - drivers/staging/brcm80211/util/siutils.c | 3 - 56 files changed, 92 insertions(+), 92 deletions(-) delete mode 100644 drivers/staging/brcm80211/brcmfmac/Kconfig create mode 100644 drivers/staging/brcm80211/brcmsmac/Makefile rename drivers/staging/brcm80211/{ => brcmsmac}/phy/phy_version.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_cmn.c (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_hal.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_int.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_lcn.c (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_lcn.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_n.c (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_radio.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phyreg_n.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phytbl_lcn.c (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phytbl_lcn.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phytbl_n.c (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phytbl_n.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/d11ucode_ext.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wl_dbg.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wl_export.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wl_mac80211.c (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wl_mac80211.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wl_ucode.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wl_ucode_loader.c (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_alloc.c (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_alloc.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_ampdu.c (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_ampdu.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_antsel.c (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_antsel.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_bmac.c (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_bmac.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_bsscfg.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_cfg.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_channel.c (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_channel.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_event.c (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_event.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_key.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_mac80211.c (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_mac80211.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_phy_shim.c (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_phy_shim.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_pub.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_rate.c (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_rate.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_scb.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_stf.c (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_stf.h (100%) rename drivers/staging/brcm80211/{ => brcmsmac}/sys/wlc_types.h (100%) 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 similarity index 100% rename from drivers/staging/brcm80211/phy/phy_version.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/phy/wlc_phy_cmn.c rename to 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 similarity index 100% rename from drivers/staging/brcm80211/phy/wlc_phy_hal.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/phy/wlc_phy_int.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/phy/wlc_phy_lcn.c rename to 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 similarity index 100% rename from drivers/staging/brcm80211/phy/wlc_phy_lcn.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/phy/wlc_phy_n.c rename to 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 similarity index 100% rename from drivers/staging/brcm80211/phy/wlc_phy_radio.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/phy/wlc_phyreg_n.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c rename to 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 similarity index 100% rename from drivers/staging/brcm80211/phy/wlc_phytbl_lcn.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/phy/wlc_phytbl_n.c rename to 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 similarity index 100% rename from drivers/staging/brcm80211/phy/wlc_phytbl_n.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/d11ucode_ext.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wl_dbg.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wl_export.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wl_mac80211.c rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wl_mac80211.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wl_ucode.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wl_ucode_loader.c rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_alloc.c rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_alloc.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_ampdu.c rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_ampdu.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_antsel.c rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_antsel.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_bmac.c rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_bmac.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_bsscfg.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_cfg.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_channel.c rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_channel.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_event.c rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_event.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_key.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_mac80211.c rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_mac80211.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_phy_shim.c rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_phy_shim.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_pub.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_rate.c rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_rate.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_scb.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_stf.c rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_stf.h rename to 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 similarity index 100% rename from drivers/staging/brcm80211/sys/wlc_types.h rename to 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 #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 #include #include -#ifdef BRCM_FULLMAC -#include -#endif #include #include #include 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 #include -#ifdef BRCM_FULLMAC -#include -#endif #include #include #include 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 #include #include -#ifdef BRCM_FULLMAC -#include -#endif #include #include #include 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 #include #include -#ifdef BRCM_FULLMAC -#include -#endif #include #include #include