Commit 69ec303a authored by Brett Rudley's avatar Brett Rudley Committed by Greg Kroah-Hartman

staging: brcm80211: migrate #includes from headers into .c files.

Signed-off-by: default avatarBrett Rudley <brudley@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 997dd24f
...@@ -27,8 +27,10 @@ ...@@ -27,8 +27,10 @@
#include <wlc_key.h> #include <wlc_key.h>
#include <sbhndpio.h> #include <sbhndpio.h>
#include <sbhnddma.h> #include <sbhnddma.h>
#include <wlc_event.h>
#include <wlc_mac80211.h> #include <wlc_mac80211.h>
#include <wlc_alloc.h> #include <wlc_alloc.h>
#include <wl_dbg.h>
static wlc_pub_t *wlc_pub_malloc(osl_t *osh, uint unit, uint *err, static wlc_pub_t *wlc_pub_malloc(osl_t *osh, uint unit, uint *err,
uint devid); uint devid);
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <wlc_rate.h> #include <wlc_rate.h>
#include <wlc_pub.h> #include <wlc_pub.h>
#include <wlc_key.h> #include <wlc_key.h>
#include <wlc_event.h>
#include <wlc_mac80211.h> #include <wlc_mac80211.h>
#include <wlc_phy_hal.h> #include <wlc_phy_hal.h>
#include <wlc_antsel.h> #include <wlc_antsel.h>
...@@ -35,6 +36,7 @@ ...@@ -35,6 +36,7 @@
#include <net/mac80211.h> #include <net/mac80211.h>
#include <wlc_ampdu.h> #include <wlc_ampdu.h>
#include <wl_export.h> #include <wl_export.h>
#include <wl_dbg.h>
#ifdef WLC_HIGH_ONLY #ifdef WLC_HIGH_ONLY
#include <bcm_rpc_tp.h> #include <bcm_rpc_tp.h>
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <wlc_key.h> #include <wlc_key.h>
#include <wlc_pub.h> #include <wlc_pub.h>
#include <wl_dbg.h> #include <wl_dbg.h>
#include <wlc_event.h>
#include <wlc_mac80211.h> #include <wlc_mac80211.h>
#include <wlc_bmac.h> #include <wlc_bmac.h>
#include <wlc_phy_hal.h> #include <wlc_phy_hal.h>
......
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
* At some point we may be able to skip the include of wlc.h and instead just * 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. * 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_mac80211.h>
#include <wlc_bmac.h> #include <wlc_bmac.h>
#include <wlc_phy_shim.h> #include <wlc_phy_shim.h>
...@@ -72,6 +73,7 @@ ...@@ -72,6 +73,7 @@
#include <pcie_core.h> #include <pcie_core.h>
#include <wlc_alloc.h> #include <wlc_alloc.h>
#include <wl_dbg.h>
#define TIMER_INTERVAL_WATCHDOG_BMAC 1000 /* watchdog timer, in unit of ms */ #define TIMER_INTERVAL_WATCHDOG_BMAC 1000 /* watchdog timer, in unit of ms */
......
...@@ -28,10 +28,12 @@ ...@@ -28,10 +28,12 @@
#include <wlioctl.h> #include <wlioctl.h>
#include <wlc_pub.h> #include <wlc_pub.h>
#include <wlc_key.h> #include <wlc_key.h>
#include <wlc_event.h>
#include <wlc_mac80211.h> #include <wlc_mac80211.h>
#include <wlc_bmac.h> #include <wlc_bmac.h>
#include <wlc_stf.h> #include <wlc_stf.h>
#include <wlc_channel.h> #include <wlc_channel.h>
#include <wl_dbg.h>
typedef struct wlc_cm_band { typedef struct wlc_cm_band {
u8 locale_flags; /* locale_info_t flags */ u8 locale_flags; /* locale_info_t flags */
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#ifdef MSGTRACE #ifdef MSGTRACE
#include <msgtrace.h> #include <msgtrace.h>
#endif #endif
#include <wl_dbg.h>
/* Local prototypes */ /* Local prototypes */
static void wlc_timer_cb(void *arg); static void wlc_timer_cb(void *arg);
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <wlc_key.h> #include <wlc_key.h>
#include <wlc_bsscfg.h> #include <wlc_bsscfg.h>
#include <wlc_channel.h> #include <wlc_channel.h>
#include <wlc_event.h>
#include <wlc_mac80211.h> #include <wlc_mac80211.h>
#include <wlc_bmac.h> #include <wlc_bmac.h>
#include <wlc_scb.h> #include <wlc_scb.h>
...@@ -61,6 +62,7 @@ ...@@ -61,6 +62,7 @@
#endif /* WLC_HIGH_ONLY */ #endif /* WLC_HIGH_ONLY */
#include <wlc_alloc.h> #include <wlc_alloc.h>
#include <net/mac80211.h> #include <net/mac80211.h>
#include <wl_dbg.h>
#ifdef WLC_HIGH_ONLY #ifdef WLC_HIGH_ONLY
#undef R_REG #undef R_REG
......
...@@ -17,19 +17,13 @@ ...@@ -17,19 +17,13 @@
#ifndef _wlc_h_ #ifndef _wlc_h_
#define _wlc_h_ #define _wlc_h_
#include <wlc_types.h>
#include <wl_dbg.h>
#include <wlioctl.h> #include <wlioctl.h>
#include <wlc_event.h>
#include <wlc_phy_hal.h> #include <wlc_phy_hal.h>
#include <wlc_channel.h> #include <wlc_channel.h>
#ifdef WLC_SPLIT #ifdef WLC_SPLIT
#include <bcm_rpc.h> #include <bcm_rpc.h>
#endif #endif
#include <wlc_bsscfg.h> #include <wlc_bsscfg.h>
#include <wlc_scb.h> #include <wlc_scb.h>
#define MA_WINDOW_SZ 8 /* moving average window size */ #define MA_WINDOW_SZ 8 /* moving average window size */
......
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
#include <wlc_channel.h> #include <wlc_channel.h>
#include <bcmsrom.h> #include <bcmsrom.h>
#include <wlc_key.h> #include <wlc_key.h>
#include <wlc_event.h>
#include <wlc_mac80211.h> #include <wlc_mac80211.h>
...@@ -54,6 +55,7 @@ ...@@ -54,6 +55,7 @@
#include <wlc_phy_shim.h> #include <wlc_phy_shim.h>
#include <wlc_phy_hal.h> #include <wlc_phy_hal.h>
#include <wl_export.h> #include <wl_export.h>
#include <wl_dbg.h>
/* PHY SHIM module specific state */ /* PHY SHIM module specific state */
struct wlc_phy_shim_info { struct wlc_phy_shim_info {
......
...@@ -33,11 +33,13 @@ ...@@ -33,11 +33,13 @@
#include <wlc_key.h> #include <wlc_key.h>
#include <wlc_channel.h> #include <wlc_channel.h>
#include <wlc_bsscfg.h> #include <wlc_bsscfg.h>
#include <wlc_event.h>
#include <wlc_mac80211.h> #include <wlc_mac80211.h>
#include <wlc_scb.h> #include <wlc_scb.h>
#include <wl_export.h> #include <wl_export.h>
#include <wlc_bmac.h> #include <wlc_bmac.h>
#include <wlc_stf.h> #include <wlc_stf.h>
#include <wl_dbg.h>
#define WLC_STF_SS_STBC_RX(wlc) (WLCISNPHY(wlc->band) && \ #define WLC_STF_SS_STBC_RX(wlc) (WLCISNPHY(wlc->band) && \
NREV_GT(wlc->band->phyrev, 3) && NREV_LE(wlc->band->phyrev, 6)) NREV_GT(wlc->band->phyrev, 3) && NREV_LE(wlc->band->phyrev, 6))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment