---

yaml --- r: 227966 b: refs/heads/master c: 69ec303 h: refs/heads/master v: v3
git-mirror · Nov 9, 2010 · 2965f04 · 2965f04
1 parent eddf0a6
commit 2965f04
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 997dd24fe9aadf6e0b3652580e7c79372ccb600c
+refs/heads/master: 69ec303a99ff68cfb5dbc6cefb043e53b6ba8945
diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_alloc.c b/trunk/drivers/staging/brcm80211/sys/wlc_alloc.c
@@ -27,8 +27,10 @@
 #include <wlc_key.h>
 #include <sbhndpio.h>
 #include <sbhnddma.h>
+#include <wlc_event.h>
 #include <wlc_mac80211.h>
 #include <wlc_alloc.h>
+#include <wl_dbg.h>
 
 static wlc_pub_t *wlc_pub_malloc(osl_t *osh, uint unit, uint *err,
 				 uint devid);

diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_ampdu.c b/trunk/drivers/staging/brcm80211/sys/wlc_ampdu.c
@@ -28,13 +28,15 @@
 #include <wlc_rate.h>
 #include <wlc_pub.h>
 #include <wlc_key.h>
+#include <wlc_event.h>
 #include <wlc_mac80211.h>
 #include <wlc_phy_hal.h>
 #include <wlc_antsel.h>
 #include <wlc_scb.h>
 #include <net/mac80211.h>
 #include <wlc_ampdu.h>
 #include <wl_export.h>
+#include <wl_dbg.h>
 
 #ifdef WLC_HIGH_ONLY
 #include <bcm_rpc_tp.h>

diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_antsel.c b/trunk/drivers/staging/brcm80211/sys/wlc_antsel.c
@@ -35,6 +35,7 @@
 #include <wlc_key.h>
 #include <wlc_pub.h>
 #include <wl_dbg.h>
+#include <wlc_event.h>
 #include <wlc_mac80211.h>
 #include <wlc_bmac.h>
 #include <wlc_phy_hal.h>

diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_bmac.c b/trunk/drivers/staging/brcm80211/sys/wlc_bmac.c
@@ -51,6 +51,7 @@
  * At some point we may be able to skip the include of wlc.h and instead just
  * define a stub wlc_info and band struct to allow rpc calls to get the rpc handle.
  */
+#include <wlc_event.h>
 #include <wlc_mac80211.h>
 #include <wlc_bmac.h>
 #include <wlc_phy_shim.h>
@@ -72,6 +73,7 @@
 #include <pcie_core.h>
 
 #include <wlc_alloc.h>
+#include <wl_dbg.h>
 
 #define	TIMER_INTERVAL_WATCHDOG_BMAC	1000	/* watchdog timer, in unit of ms */
 

diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_channel.c b/trunk/drivers/staging/brcm80211/sys/wlc_channel.c
@@ -28,10 +28,12 @@
 #include <wlioctl.h>
 #include <wlc_pub.h>
 #include <wlc_key.h>
+#include <wlc_event.h>
 #include <wlc_mac80211.h>
 #include <wlc_bmac.h>
 #include <wlc_stf.h>
 #include <wlc_channel.h>
+#include <wl_dbg.h>
 
 typedef struct wlc_cm_band {
 	u8 locale_flags;	/* locale_info_t flags */

diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_event.c b/trunk/drivers/staging/brcm80211/sys/wlc_event.c
@@ -36,6 +36,7 @@
 #ifdef MSGTRACE
 #include <msgtrace.h>
 #endif
+#include <wl_dbg.h>
 
 /* Local prototypes */
 static void wlc_timer_cb(void *arg);

diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c b/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -37,6 +37,7 @@
 #include <wlc_key.h>
 #include <wlc_bsscfg.h>
 #include <wlc_channel.h>
+#include <wlc_event.h>
 #include <wlc_mac80211.h>
 #include <wlc_bmac.h>
 #include <wlc_scb.h>
@@ -61,6 +62,7 @@
 #endif				/* WLC_HIGH_ONLY */
 #include <wlc_alloc.h>
 #include <net/mac80211.h>
+#include <wl_dbg.h>
 
 #ifdef WLC_HIGH_ONLY
 #undef R_REG

diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.h b/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.h
@@ -17,19 +17,13 @@
 #ifndef _wlc_h_
 #define _wlc_h_
 
-#include <wlc_types.h>
-
-#include <wl_dbg.h>
 #include <wlioctl.h>
-#include <wlc_event.h>
 #include <wlc_phy_hal.h>
 #include <wlc_channel.h>
 #ifdef WLC_SPLIT
 #include <bcm_rpc.h>
 #endif
-
 #include <wlc_bsscfg.h>
-
 #include <wlc_scb.h>
 
 #define MA_WINDOW_SZ		8	/* moving average window size */

diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_phy_shim.c b/trunk/drivers/staging/brcm80211/sys/wlc_phy_shim.c
@@ -47,13 +47,15 @@
 #include <wlc_channel.h>
 #include <bcmsrom.h>
 #include <wlc_key.h>
+#include <wlc_event.h>
 
 #include <wlc_mac80211.h>
 
 #include <wlc_bmac.h>
 #include <wlc_phy_shim.h>
 #include <wlc_phy_hal.h>
 #include <wl_export.h>
+#include <wl_dbg.h>
 
 /* PHY SHIM module specific state */
 struct wlc_phy_shim_info {

diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_stf.c b/trunk/drivers/staging/brcm80211/sys/wlc_stf.c
@@ -33,11 +33,13 @@
 #include <wlc_key.h>
 #include <wlc_channel.h>
 #include <wlc_bsscfg.h>
+#include <wlc_event.h>
 #include <wlc_mac80211.h>
 #include <wlc_scb.h>
 #include <wl_export.h>
 #include <wlc_bmac.h>
 #include <wlc_stf.h>
+#include <wl_dbg.h>
 
 #define WLC_STF_SS_STBC_RX(wlc) (WLCISNPHY(wlc->band) && \
 	NREV_GT(wlc->band->phyrev, 3) && NREV_LE(wlc->band->phyrev, 6))