diff options
37 files changed, 54 insertions, 54 deletions
diff --git a/drivers/staging/brcm80211/Makefile b/drivers/staging/brcm80211/Makefile index e7b3f27847cf..db9a57e4607a 100644 --- a/drivers/staging/brcm80211/Makefile +++ b/drivers/staging/brcm80211/Makefile @@ -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/ diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c index 14c07e602ee3..352ba4bafda3 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c @@ -21,8 +21,8 @@ #include <linux/sched.h> #include <bcmdefs.h> #include <bcmdevs.h> -#include <bcmutils.h> -#include <bcmwifi.h> +#include <brcmu_utils.h> +#include <brcmu_wifi.h> #include <bcmsoc.h> #include <bcmsdh.h> /* BRCM API for SDIO diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c index c0b9330aa4c4..e7638f4eca37 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c @@ -27,8 +27,8 @@ #include <bcmdefs.h> #include <bcmdevs.h> -#include <bcmutils.h> -#include <bcmwifi.h> +#include <brcmu_utils.h> +#include <brcmu_wifi.h> #if defined(OOB_INTR_ONLY) #include <linux/irq.h> diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c index 1b15704257a9..8dadfb662bf4 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c @@ -18,8 +18,8 @@ #include <linux/mmc/sdio.h> #include <bcmdefs.h> #include <bcmdevs.h> -#include <bcmutils.h> -#include <bcmwifi.h> +#include <brcmu_utils.h> +#include <brcmu_wifi.h> #include <bcmsdbus.h> /* bcmsdh to/from specific controller APIs */ #include <sdiovar.h> /* ioctl/iovars */ diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c index fbc9abd73799..e1b259202331 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c @@ -18,8 +18,8 @@ #include <linux/netdevice.h> #include <net/cfg80211.h> #include <bcmdefs.h> -#include <bcmutils.h> -#include <bcmwifi.h> +#include <brcmu_utils.h> +#include <brcmu_wifi.h> #include <bcmsdbus.h> /* bcmsdh to/from specific controller APIs */ #include <sdiovar.h> /* to get msglevel bit values */ diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c index 759e899ba3c5..dd872f4d1b0f 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c @@ -19,8 +19,8 @@ #include <linux/sched.h> #include <bcmdefs.h> -#include <bcmutils.h> -#include <bcmwifi.h> +#include <brcmu_utils.h> +#include <brcmu_wifi.h> #include <dngl_stats.h> #include <dhd.h> diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c index 5b0554d94206..a8504bb2a517 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c @@ -17,10 +17,10 @@ #include <linux/string.h> #include <linux/sched.h> #include <bcmdefs.h> -#include <bcmwifi.h> +#include <brcmu_wifi.h> #include <linux/netdevice.h> #include <asm/unaligned.h> -#include <bcmutils.h> +#include <brcmu_utils.h> #include <dngl_stats.h> #include <dhd.h> #include <dhd_bus.h> diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c index a94233376547..831f32447e39 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c @@ -16,9 +16,9 @@ #include <linux/netdevice.h> #include <linux/sched.h> -#include <bcmutils.h> +#include <brcmu_utils.h> #include <bcmdefs.h> -#include <bcmwifi.h> +#include <brcmu_wifi.h> #include <dngl_stats.h> #include <dhd.h> diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index 7f1cf8b421a0..adcf82daee98 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -33,8 +33,8 @@ #include <linux/uaccess.h> #include <net/cfg80211.h> #include <bcmdefs.h> -#include <bcmutils.h> -#include <bcmwifi.h> +#include <brcmu_utils.h> +#include <brcmu_wifi.h> #include <dngl_stats.h> #include <dhd.h> diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index cc3e47da3ba0..75393e765fce 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c @@ -26,8 +26,8 @@ #include <bcmsdh.h> #include <bcmdefs.h> -#include <bcmwifi.h> -#include <bcmutils.h> +#include <brcmu_wifi.h> +#include <brcmu_utils.h> #include <bcmdevs.h> #include <bcmsoc.h> diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c index 13a643417560..38453cfa42ad 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c @@ -18,9 +18,9 @@ #include <linux/if_arp.h> #include <linux/sched.h> -#include <bcmutils.h> +#include <brcmu_utils.h> #include <bcmdefs.h> -#include <bcmwifi.h> +#include <brcmu_wifi.h> #include <asm/uaccess.h> diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c index 99a49f97ced3..f5725ec7842b 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c @@ -21,8 +21,8 @@ #include <linux/etherdevice.h> #include <linux/wireless.h> -#include <bcmutils.h> -#include <bcmwifi.h> +#include <brcmu_utils.h> +#include <brcmu_wifi.h> #include <linux/if_arp.h> #include <asm/uaccess.h> diff --git a/drivers/staging/brcm80211/brcmsmac/aiutils.c b/drivers/staging/brcm80211/brcmsmac/aiutils.c index d57908b08acd..b00cda9c583b 100644 --- a/drivers/staging/brcm80211/brcmsmac/aiutils.c +++ b/drivers/staging/brcm80211/brcmsmac/aiutils.c @@ -20,7 +20,7 @@ #include <bcmdefs.h> #include <linux/module.h> #include <linux/pci.h> -#include <bcmutils.h> +#include <brcmu_utils.h> #include <aiutils.h> #include <bcmsoc.h> #include <chipcommon.h> diff --git a/drivers/staging/brcm80211/brcmsmac/bcmotp.c b/drivers/staging/brcm80211/brcmsmac/bcmotp.c index cca64e4f2a62..4a0deecbfaf6 100644 --- a/drivers/staging/brcm80211/brcmsmac/bcmotp.c +++ b/drivers/staging/brcm80211/brcmsmac/bcmotp.c @@ -23,7 +23,7 @@ #include <bcmdefs.h> #include <bcmdevs.h> -#include <bcmutils.h> +#include <brcmu_utils.h> #include <aiutils.h> #include <bcmsoc.h> #include <chipcommon.h> diff --git a/drivers/staging/brcm80211/brcmsmac/bcmsrom.c b/drivers/staging/brcm80211/brcmsmac/bcmsrom.c index 59098b088519..70b7ab7c3a23 100644 --- a/drivers/staging/brcm80211/brcmsmac/bcmsrom.c +++ b/drivers/staging/brcm80211/brcmsmac/bcmsrom.c @@ -21,7 +21,7 @@ #include <linux/pci.h> #include <stdarg.h> #include "wlc_types.h" -#include <bcmutils.h> +#include <brcmu_utils.h> #include <bcmsoc.h> #include <chipcommon.h> #include <bcmdevs.h> diff --git a/drivers/staging/brcm80211/brcmsmac/brcms_mac80211.c b/drivers/staging/brcm80211/brcmsmac/brcms_mac80211.c index 71acc4ef77e0..509cf2b20035 100644 --- a/drivers/staging/brcm80211/brcmsmac/brcms_mac80211.c +++ b/drivers/staging/brcm80211/brcmsmac/brcms_mac80211.c @@ -26,8 +26,8 @@ #include <linux/firmware.h> #include <net/mac80211.h> #include <bcmdefs.h> -#include <bcmwifi.h> -#include <bcmutils.h> +#include <brcmu_wifi.h> +#include <brcmu_utils.h> #include <bcmnvram.h> #include <nicpci.h> #include "bcmdma.h" diff --git a/drivers/staging/brcm80211/brcmsmac/dma.c b/drivers/staging/brcm80211/brcmsmac/dma.c index ad389bca4e55..183baf88b05d 100644 --- a/drivers/staging/brcm80211/brcmsmac/dma.c +++ b/drivers/staging/brcm80211/brcmsmac/dma.c @@ -21,7 +21,7 @@ #include <bcmdefs.h> #include <bcmdevs.h> #include <bcmsoc.h> -#include <bcmutils.h> +#include <brcmu_utils.h> #include <aiutils.h> #include "wlc_types.h" diff --git a/drivers/staging/brcm80211/brcmsmac/nicpci.c b/drivers/staging/brcm80211/brcmsmac/nicpci.c index 8a956f5f26ee..868fba2656ae 100644 --- a/drivers/staging/brcm80211/brcmsmac/nicpci.c +++ b/drivers/staging/brcm80211/brcmsmac/nicpci.c @@ -18,7 +18,7 @@ #include <linux/string.h> #include <linux/pci.h> #include <bcmdefs.h> -#include <bcmutils.h> +#include <brcmu_utils.h> #include <bcmnvram.h> #include <aiutils.h> #include <bcmsoc.h> diff --git a/drivers/staging/brcm80211/brcmsmac/nvram.c b/drivers/staging/brcm80211/brcmsmac/nvram.c index 5cef837d6910..3509469214db 100644 --- a/drivers/staging/brcm80211/brcmsmac/nvram.c +++ b/drivers/staging/brcm80211/brcmsmac/nvram.c @@ -17,7 +17,7 @@ #include <linux/slab.h> #include <linux/string.h> #include <bcmdefs.h> -#include <bcmutils.h> +#include <brcmu_utils.h> #include <bcmnvram.h> #include <chipcommon.h> #include <bcmdevs.h> diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h index 6d4473c5a56b..6488cdfb65ae 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h @@ -25,7 +25,7 @@ #include <d11.h> #include <wlc_phy_shim.h> #include <net/mac80211.h> /* struct wiphy */ -#include "bcmwifi.h" /* chanspec_t */ +#include "brcmu_wifi.h" /* chanspec_t */ #define IDCODE_VER_MASK 0x0000000f #define IDCODE_VER_SHIFT 0 diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h index 43d0fe14f243..3ee29f0be495 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h @@ -19,7 +19,7 @@ #include <linux/kernel.h> #include <bcmdefs.h> -#include <bcmutils.h> +#include <brcmu_utils.h> #include <wlc_phy_hal.h> diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c index 619247a86250..77caf067df49 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c @@ -17,7 +17,7 @@ #include <linux/types.h> #include <bcmdefs.h> -#include <bcmutils.h> +#include <brcmu_utils.h> #include <aiutils.h> #include "bcmdma.h" diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c index e1920ae3adba..36684512fe90 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c @@ -17,7 +17,7 @@ #include <net/mac80211.h> #include <bcmdefs.h> -#include <bcmutils.h> +#include <brcmu_utils.h> #include <aiutils.h> #include "bcmdma.h" #include <bcmdma.h> diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c index ea27b66c56e6..10b9b7985e25 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c @@ -21,7 +21,7 @@ #include <linux/pci.h> #include <bcmdefs.h> -#include <bcmutils.h> +#include <brcmu_utils.h> #include <bcmnvram.h> #include <aiutils.h> #include <bcmdevs.h> diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c index fdd10efbfe9e..d23dd11c904c 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c @@ -23,11 +23,11 @@ #include <bcmdefs.h> #include <bcmdevs.h> -#include <bcmwifi.h> +#include <brcmu_wifi.h> #include <aiutils.h> #include <bcmsrom.h> #include <bcmotp.h> -#include <bcmutils.h> +#include <brcmu_utils.h> #include <bcmnvram.h> #include <chipcommon.h> #include <nicpci.h> diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c index ac84ddcd6aa3..c4fcb441eed4 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c @@ -20,7 +20,7 @@ #include <linux/pci.h> #include <bcmdefs.h> -#include <bcmutils.h> +#include <brcmu_utils.h> #include <bcmnvram.h> #include <aiutils.h> #include "bcmdma.h" diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_main.c b/drivers/staging/brcm80211/brcmsmac/wlc_main.c index 1e79031c1ea4..752f0d18aaab 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_main.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_main.c @@ -21,8 +21,8 @@ #include <bcmdefs.h> #include <bcmdevs.h> -#include <bcmutils.h> -#include <bcmwifi.h> +#include <brcmu_utils.h> +#include <brcmu_wifi.h> #include <bcmnvram.h> #include <aiutils.h> #include <bcmsrom.h> diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c index d33f7200a20e..2745743b5e8c 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c @@ -25,8 +25,8 @@ #include <linux/module.h> #include <bcmdefs.h> -#include <bcmutils.h> -#include <bcmwifi.h> +#include <brcmu_utils.h> +#include <brcmu_wifi.h> #include <aiutils.h> #include <chipcommon.h> #include "bcmdma.h" diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_pmu.c b/drivers/staging/brcm80211/brcmsmac/wlc_pmu.c index 047cd1adc798..9a99186e7af8 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_pmu.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_pmu.c @@ -20,7 +20,7 @@ #include <bcmdevs.h> #include <chipcommon.h> -#include <bcmutils.h> +#include <brcmu_utils.h> #include <bcmnvram.h> #include "wlc_pmu.h" diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_pub.h b/drivers/staging/brcm80211/brcmsmac/wlc_pub.h index de324408ddb2..8536efedf1b8 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_pub.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_pub.h @@ -18,7 +18,7 @@ #define _wlc_pub_h_ #include "wlc_types.h" /* forward structure declarations */ -#include "bcmwifi.h" /* for chanspec_t */ +#include "brcmu_wifi.h" /* for chanspec_t */ #define WLC_NUMRATES 16 /* max # of rates in a rateset */ #define MAXMULTILIST 32 /* max # multicast addresses */ diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c index 88aa134ad67a..3625c72b25de 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c @@ -17,7 +17,7 @@ #include <linux/module.h> #include <bcmdefs.h> -#include <bcmutils.h> +#include <brcmu_utils.h> #include <aiutils.h> #include "bcmdma.h" diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c index b7191af06697..41c1f96acb42 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c @@ -18,9 +18,9 @@ #include <linux/module.h> #include <bcmdefs.h> -#include <bcmutils.h> +#include <brcmu_utils.h> #include <aiutils.h> -#include <bcmwifi.h> +#include <brcmu_wifi.h> #include <bcmnvram.h> #include "bcmdma.h" diff --git a/drivers/staging/brcm80211/util/Makefile b/drivers/staging/brcm80211/brcmutil/Makefile index f9b36cafdc87..6403423c0212 100644 --- a/drivers/staging/brcm80211/util/Makefile +++ b/drivers/staging/brcm80211/brcmutil/Makefile @@ -16,12 +16,12 @@ # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ccflags-y := \ - -Idrivers/staging/brcm80211/util \ + -Idrivers/staging/brcm80211/brcmutil \ -Idrivers/staging/brcm80211/include BRCMUTIL_OFILES := \ - bcmutils.o \ - bcmwifi.o + utils.o \ + wifi.o MODULEPFX := brcmutil diff --git a/drivers/staging/brcm80211/util/bcmutils.c b/drivers/staging/brcm80211/brcmutil/utils.c index eb55ce46eaf1..d259e265352f 100644 --- a/drivers/staging/brcm80211/util/bcmutils.c +++ b/drivers/staging/brcm80211/brcmutil/utils.c @@ -24,7 +24,7 @@ #include <linux/printk.h> #include <bcmdefs.h> #include <stdarg.h> -#include <bcmutils.h> +#include <brcmu_utils.h> #include <bcmdevs.h> MODULE_AUTHOR("Broadcom Corporation"); diff --git a/drivers/staging/brcm80211/util/bcmwifi.c b/drivers/staging/brcm80211/brcmutil/wifi.c index 207cb8bfc4af..2a3db0a008d0 100644 --- a/drivers/staging/brcm80211/util/bcmwifi.c +++ b/drivers/staging/brcm80211/brcmutil/wifi.c @@ -17,8 +17,8 @@ #include <linux/kernel.h> #include <linux/module.h> #include <bcmdefs.h> -#include <bcmutils.h> -#include <bcmwifi.h> +#include <brcmu_utils.h> +#include <brcmu_wifi.h> /* * Verify the chanspec is using a legal set of parameters, i.e. that the diff --git a/drivers/staging/brcm80211/include/bcmutils.h b/drivers/staging/brcm80211/include/brcmu_utils.h index 73854a4ad72e..73854a4ad72e 100644 --- a/drivers/staging/brcm80211/include/bcmutils.h +++ b/drivers/staging/brcm80211/include/brcmu_utils.h diff --git a/drivers/staging/brcm80211/include/bcmwifi.h b/drivers/staging/brcm80211/include/brcmu_wifi.h index 6b12c138cec5..6b12c138cec5 100644 --- a/drivers/staging/brcm80211/include/bcmwifi.h +++ b/drivers/staging/brcm80211/include/brcmu_wifi.h |