From: Arend van Spriel <arend@xxxxxxxxxxxx>
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 <rvossen@xxxxxxxxxxxx>
Reviewed-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
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 +-
.../brcmsmac/{wlc_mac80211.c => wlc_main.c} | 2 +-
.../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 315f1ae..b0d3e07 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 fecafc3..0b6c6e7 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 0162ba4..e9cdb05 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 5b195ed..33e3bdf 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 b6e49f7..71f8a22 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 71731a4..49b1ea6 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 2772cce..87391ba 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 95aafdd..e867bf7 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 9e27be9..75aeb28 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"
--
1.7.4.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
