From 7ae92624969bdee951b64f638898ac9f96646558 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Wed, 2 Mar 2011 09:08:43 +0100 Subject: [PATCH] staging: brcm80211: changed module wlc_mac80211 to wlc_main The source and include file for the wlc_mac80211 module has been renamed to wlc_main and subsequently the include statement in other source files. This module provides the main interface towards wl_mac80211 module. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/brcmsmac/Makefile | 2 +- drivers/staging/brcm80211/brcmsmac/wlc_alloc.c | 2 +- drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | 2 +- drivers/staging/brcm80211/brcmsmac/wlc_antsel.c | 2 +- drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | 2 +- drivers/staging/brcm80211/brcmsmac/wlc_channel.c | 2 +- .../staging/brcm80211/brcmsmac/{wlc_mac80211.c => wlc_main.c} | 2 +- .../staging/brcm80211/brcmsmac/{wlc_mac80211.h => wlc_main.h} | 0 drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c | 2 +- drivers/staging/brcm80211/brcmsmac/wlc_stf.c | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename drivers/staging/brcm80211/brcmsmac/{wlc_mac80211.c => wlc_main.c} (99%) rename drivers/staging/brcm80211/brcmsmac/{wlc_mac80211.h => wlc_main.h} (100%) diff --git a/drivers/staging/brcm80211/brcmsmac/Makefile b/drivers/staging/brcm80211/brcmsmac/Makefile index 315f1ae9de0..b0d3e074e40 100644 --- a/drivers/staging/brcm80211/brcmsmac/Makefile +++ b/drivers/staging/brcm80211/brcmsmac/Makefile @@ -36,7 +36,7 @@ BRCMSMAC_OFILES := \ wlc_antsel.o \ wlc_bmac.o \ wlc_channel.o \ - wlc_mac80211.o \ + wlc_main.o \ wlc_phy_shim.o \ wlc_rate.o \ wlc_stf.o \ diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c index fecafc3958e..0b6c6e72bdd 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c @@ -35,7 +35,7 @@ #include "wlc_bsscfg.h" #include "phy/wlc_phy_hal.h" #include "wlc_channel.h" -#include "wlc_mac80211.h" +#include "wlc_main.h" static struct wlc_bsscfg *wlc_bsscfg_malloc(uint unit); static void wlc_bsscfg_mfree(struct wlc_bsscfg *cfg); diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c index 0162ba4fb02..e9cdb05e531 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c @@ -37,7 +37,7 @@ #include "wl_dbg.h" #include "wlc_bsscfg.h" #include "wlc_channel.h" -#include "wlc_mac80211.h" +#include "wlc_main.h" #include "wlc_ampdu.h" /* diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c index 5b195ed6376..33e3bdff61b 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c @@ -38,7 +38,7 @@ #include "wlc_bmac.h" #include "wlc_channel.h" #include "wlc_bsscfg.h" -#include "wlc_mac80211.h" +#include "wlc_main.h" #include "wl_export.h" #include "wlc_phy_shim.h" #include "wlc_antsel.h" diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c index b6e49f7af06..71f8a223480 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c @@ -49,7 +49,7 @@ #include "phy/wlc_phy_hal.h" #include "wlc_channel.h" #include "wlc_bsscfg.h" -#include "wlc_mac80211.h" +#include "wlc_main.h" #include "wl_export.h" #include "wl_ucode.h" #include "wlc_antsel.h" diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c index 71731a4618c..49b1ea6b7ea 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c @@ -37,7 +37,7 @@ #include "wlc_rate.h" #include "wlc_channel.h" #include "wlc_bsscfg.h" -#include "wlc_mac80211.h" +#include "wlc_main.h" #include "wlc_stf.h" #include "wl_dbg.h" diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wlc_main.c similarity index 99% rename from drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c rename to drivers/staging/brcm80211/brcmsmac/wlc_main.c index 2772cce78dc..87391bad4fe 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_main.c @@ -41,7 +41,7 @@ #include "wlc_bsscfg.h" #include "phy/wlc_phy_hal.h" #include "wlc_channel.h" -#include "wlc_mac80211.h" +#include "wlc_main.h" #include "wlc_bmac.h" #include "wlc_phy_hal.h" #include "wlc_phy_shim.h" diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.h b/drivers/staging/brcm80211/brcmsmac/wlc_main.h similarity index 100% rename from drivers/staging/brcm80211/brcmsmac/wlc_mac80211.h rename to drivers/staging/brcm80211/brcmsmac/wlc_main.h diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c index 95aafddcc95..e867bf72cb4 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c @@ -54,7 +54,7 @@ #include "wlc_phy_hal.h" #include "wl_export.h" #include "wlc_bsscfg.h" -#include "wlc_mac80211.h" +#include "wlc_main.h" #include "wlc_phy_shim.h" /* PHY SHIM module specific state */ diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c index 9e27be9d49f..75aeb280eb9 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c @@ -38,7 +38,7 @@ #include "phy/wlc_phy_hal.h" #include "wlc_channel.h" #include "wlc_bsscfg.h" -#include "wlc_mac80211.h" +#include "wlc_main.h" #include "wl_export.h" #include "wlc_bmac.h" #include "wlc_stf.h" -- 2.41.0