diff --git a/drivers/staging/brcm80211/brcmsmac/Makefile b/drivers/staging/brcm80211/brcmsmac/Makefile
index 315f1ae9de0f8cd5ae5986ce7ae36370944d819d..b0d3e074e400b5de108ce7b849c6ab5ac0af8d9b 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 fecafc3958e27f2d050ffad14f58f33d066c1999..0b6c6e72bdd09623992c26c3466999b4777d7e70 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 0162ba4fb02fb9f7b0863fc44a1a38988dc82afb..e9cdb05e531bc37f10f28b655350cbd064f1a9d9 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 5b195ed63768a2c392ceac1a51c0d9639eaf2410..33e3bdff61bcb554c65998c3eafb53987898ec31 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 b6e49f7af06354f683c8ced7a64a9639ce1f5b86..71f8a2234801d51665c19e154a25ac4cb8780676 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 71731a4618c64ffd40cb8df75c8eea172904ff76..49b1ea6b7ea878084ed00e45a3f87a488771f3af 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 2772cce78dc06afdc65bdef490606a1f0a3131d4..87391bad4feae8b13ee81fe37a1227b4eb07bb6b 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 95aafddcc95d5641c1202441eab89dc0af25af9c..e867bf72cb41c605f5b2a088cd533757a66db0e4 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 9e27be9d49f9c6358e59d16703f8f4e08f5f33b4..75aeb280eb99bb10b5c78ab7b7a2aee91610fd5f 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"