diff options
author | Arend van Spriel <arend@broadcom.com> | 2011-02-25 10:39:14 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-28 21:17:38 -0500 |
commit | 45575664fb22c50a686719f1f1e07b13cd04ef1c (patch) | |
tree | 62af01acd88deaed2022b72aa3eab119c7831879 | |
parent | 62b54dca17ef40116491b0ca27ca35fbe9daedc6 (diff) |
staging: brcm80211: remove nested include statements
In order to analyze include file usage nested includes have been
removed from the driver sources.
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 38 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wl_mac80211.h | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_alloc.c | 30 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | 32 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_antsel.c | 35 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | 63 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_channel.c | 33 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_channel.h | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c | 46 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_mac80211.h | 6 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c | 42 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_pub.h | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_rate.c | 22 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_scb.h | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_stf.c | 36 |
16 files changed, 208 insertions, 189 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c index 6e421b94727..1b3f12ba5ed 100644 --- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c +++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | |||
@@ -18,35 +18,35 @@ | |||
18 | 18 | ||
19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
20 | #include <linux/etherdevice.h> | 20 | #include <linux/etherdevice.h> |
21 | #include <linux/string.h> | 21 | #include <linux/types.h> |
22 | #include <linux/pci_ids.h> | 22 | #include <linux/pci_ids.h> |
23 | #include <bcmdefs.h> | ||
24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
25 | #include <linux/pci.h> | 24 | #include <linux/pci.h> |
26 | #include <linux/sched.h> | 25 | #include <linux/sched.h> |
27 | #include <osl.h> | 26 | #include <linux/firmware.h> |
28 | #define WLC_MAXBSSCFG 1 /* single BSS configs */ | ||
29 | |||
30 | #include <wlc_cfg.h> | ||
31 | #include <net/mac80211.h> | 27 | #include <net/mac80211.h> |
32 | #include <phy_version.h> | 28 | |
29 | #include <proto/802.1d.h> | ||
30 | #include <bcmdefs.h> | ||
31 | #include <osl.h> | ||
33 | #include <bcmutils.h> | 32 | #include <bcmutils.h> |
34 | #include <pcicfg.h> | 33 | #include <pcicfg.h> |
35 | #include <wlioctl.h> | 34 | #include <wlioctl.h> |
36 | #include <wlc_key.h> | ||
37 | #include <sbhndpio.h> | ||
38 | #include <sbhnddma.h> | 35 | #include <sbhnddma.h> |
39 | #include <wlc_channel.h> | ||
40 | #include <wlc_pub.h> | ||
41 | #include <wlc_scb.h> | ||
42 | #include <wl_dbg.h> | ||
43 | #include <wl_export.h> | ||
44 | |||
45 | #include <wl_mac80211.h> | ||
46 | #include <linux/firmware.h> | ||
47 | #include <wl_ucode.h> | ||
48 | #include <d11ucode_ext.h> | ||
49 | 36 | ||
37 | #include "wlc_cfg.h" | ||
38 | #include "phy/phy_version.h" | ||
39 | #include "wlc_key.h" | ||
40 | #include "sbhndpio.h" | ||
41 | #include "phy/wlc_phy_hal.h" | ||
42 | #include "wlc_channel.h" | ||
43 | #include "wlc_scb.h" | ||
44 | #include "wlc_pub.h" | ||
45 | #include "wl_dbg.h" | ||
46 | #include "wl_export.h" | ||
47 | #include "wl_ucode.h" | ||
48 | #include "d11ucode_ext.h" | ||
49 | #include "wl_mac80211.h" | ||
50 | 50 | ||
51 | static void wl_timer(unsigned long data); | 51 | static void wl_timer(unsigned long data); |
52 | static void _wl_timer(wl_timer_t *t); | 52 | static void _wl_timer(wl_timer_t *t); |
diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h index b7407caa4db..f761fd14ee4 100644 --- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h +++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h | |||
@@ -17,8 +17,6 @@ | |||
17 | #ifndef _wl_mac80211_h_ | 17 | #ifndef _wl_mac80211_h_ |
18 | #define _wl_mac80211_h_ | 18 | #define _wl_mac80211_h_ |
19 | 19 | ||
20 | #include <wlc_types.h> | ||
21 | |||
22 | /* BMAC Note: High-only driver is no longer working in softirq context as it needs to block and | 20 | /* BMAC Note: High-only driver is no longer working in softirq context as it needs to block and |
23 | * sleep so perimeter lock has to be a semaphore instead of spinlock. This requires timers to be | 21 | * sleep so perimeter lock has to be a semaphore instead of spinlock. This requires timers to be |
24 | * submitted to workqueue instead of being on kernel timer | 22 | * submitted to workqueue instead of being on kernel timer |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c index a4555f74512..20a0f86a2cd 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c | |||
@@ -14,22 +14,30 @@ | |||
14 | * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 14 | * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
15 | */ | 15 | */ |
16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
17 | #include <linux/string.h> | 17 | #include <linux/types.h> |
18 | #include <bcmdefs.h> | 18 | |
19 | #include <wlc_cfg.h> | 19 | #include <proto/802.1d.h> |
20 | #include <linux/module.h> | ||
21 | #include <linux/pci.h> | ||
22 | #include <osl.h> | 20 | #include <osl.h> |
21 | #include <bcmdefs.h> | ||
23 | #include <bcmutils.h> | 22 | #include <bcmutils.h> |
24 | #include <siutils.h> | 23 | #include <siutils.h> |
25 | #include <wlioctl.h> | 24 | #include <wlioctl.h> |
26 | #include <wlc_pub.h> | ||
27 | #include <wlc_key.h> | ||
28 | #include <sbhndpio.h> | ||
29 | #include <sbhnddma.h> | 25 | #include <sbhnddma.h> |
30 | #include <wlc_mac80211.h> | 26 | |
31 | #include <wlc_alloc.h> | 27 | #include "sbhndpio.h" |
32 | #include <wl_dbg.h> | 28 | #include "d11.h" |
29 | #include "wlc_types.h" | ||
30 | #include "wlc_cfg.h" | ||
31 | #include "wlc_scb.h" | ||
32 | #include "wlc_pub.h" | ||
33 | #include "wlc_key.h" | ||
34 | #include "wlc_alloc.h" | ||
35 | #include "wl_dbg.h" | ||
36 | #include "wlc_rate.h" | ||
37 | #include "wlc_bsscfg.h" | ||
38 | #include "phy/wlc_phy_hal.h" | ||
39 | #include "wlc_channel.h" | ||
40 | #include "wlc_mac80211.h" | ||
33 | 41 | ||
34 | static struct wlc_bsscfg *wlc_bsscfg_malloc(struct osl_info *osh, uint unit); | 42 | static struct wlc_bsscfg *wlc_bsscfg_malloc(struct osl_info *osh, uint unit); |
35 | static void wlc_bsscfg_mfree(struct osl_info *osh, struct wlc_bsscfg *cfg); | 43 | static void wlc_bsscfg_mfree(struct osl_info *osh, struct wlc_bsscfg *cfg); |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c index d6475af0f7e..68b65a0c896 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | |||
@@ -14,9 +14,11 @@ | |||
14 | * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 14 | * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
15 | */ | 15 | */ |
16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
17 | #include <wlc_cfg.h> | 17 | #include <net/mac80211.h> |
18 | #include <bcmdefs.h> | 18 | |
19 | #include <proto/802.1d.h> | ||
19 | #include <osl.h> | 20 | #include <osl.h> |
21 | #include <bcmdefs.h> | ||
20 | #include <bcmutils.h> | 22 | #include <bcmutils.h> |
21 | #include <siutils.h> | 23 | #include <siutils.h> |
22 | #include <wlioctl.h> | 24 | #include <wlioctl.h> |
@@ -24,17 +26,21 @@ | |||
24 | #include <sbhnddma.h> | 26 | #include <sbhnddma.h> |
25 | #include <hnddma.h> | 27 | #include <hnddma.h> |
26 | #include <d11.h> | 28 | #include <d11.h> |
27 | #include <wlc_rate.h> | 29 | |
28 | #include <wlc_pub.h> | 30 | #include "wlc_types.h" |
29 | #include <wlc_key.h> | 31 | #include "wlc_cfg.h" |
30 | #include <wlc_mac80211.h> | 32 | #include "wlc_rate.h" |
31 | #include <wlc_phy_hal.h> | 33 | #include "wlc_scb.h" |
32 | #include <wlc_antsel.h> | 34 | #include "wlc_pub.h" |
33 | #include <wlc_scb.h> | 35 | #include "wlc_key.h" |
34 | #include <net/mac80211.h> | 36 | #include "phy/wlc_phy_hal.h" |
35 | #include <wlc_ampdu.h> | 37 | #include "wlc_antsel.h" |
36 | #include <wl_export.h> | 38 | #include "wl_export.h" |
37 | #include <wl_dbg.h> | 39 | #include "wl_dbg.h" |
40 | #include "wlc_bsscfg.h" | ||
41 | #include "wlc_channel.h" | ||
42 | #include "wlc_mac80211.h" | ||
43 | #include "wlc_ampdu.h" | ||
38 | 44 | ||
39 | /* | 45 | /* |
40 | * Disable AMPDU statistics counters for now | 46 | * Disable AMPDU statistics counters for now |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c index da19a082ee4..a5f2508367e 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c | |||
@@ -21,26 +21,31 @@ | |||
21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
23 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
24 | #include <bcmdefs.h> | 24 | |
25 | #include <proto/802.1d.h> | ||
25 | #include <osl.h> | 26 | #include <osl.h> |
27 | #include <bcmdefs.h> | ||
26 | #include <bcmutils.h> | 28 | #include <bcmutils.h> |
27 | #include <siutils.h> | 29 | #include <siutils.h> |
28 | #include <wlioctl.h> | ||
29 | |||
30 | #include <bcmdevs.h> | 30 | #include <bcmdevs.h> |
31 | #include <sbhndpio.h> | ||
32 | #include <sbhnddma.h> | 31 | #include <sbhnddma.h> |
33 | #include <d11.h> | 32 | #include <wlioctl.h> |
34 | #include <wlc_rate.h> | 33 | |
35 | #include <wlc_key.h> | 34 | #include "sbhndpio.h" |
36 | #include <wlc_pub.h> | 35 | #include "d11.h" |
37 | #include <wl_dbg.h> | 36 | #include "wlc_rate.h" |
38 | #include <wlc_mac80211.h> | 37 | #include "wlc_key.h" |
39 | #include <wlc_bmac.h> | 38 | #include "wlc_scb.h" |
40 | #include <wlc_phy_hal.h> | 39 | #include "wlc_pub.h" |
41 | #include <wl_export.h> | 40 | #include "wl_dbg.h" |
42 | #include <wlc_antsel.h> | 41 | #include "phy/wlc_phy_hal.h" |
43 | #include <wlc_phy_shim.h> | 42 | #include "wlc_bmac.h" |
43 | #include "wlc_channel.h" | ||
44 | #include "wlc_bsscfg.h" | ||
45 | #include "wlc_mac80211.h" | ||
46 | #include "wl_export.h" | ||
47 | #include "wlc_phy_shim.h" | ||
48 | #include "wlc_antsel.h" | ||
44 | 49 | ||
45 | /* useful macros */ | 50 | /* useful macros */ |
46 | #define WLC_ANTSEL_11N_0(ant) ((((ant) & ANT_SELCFG_MASK) >> 4) & 0xf) | 51 | #define WLC_ANTSEL_11N_0(ant) ((((ant) & ANT_SELCFG_MASK) >> 4) & 0xf) |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c index 20ce4c3777e..dc41593d956 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | |||
@@ -16,57 +16,50 @@ | |||
16 | 16 | ||
17 | 17 | ||
18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
19 | #include <wlc_cfg.h> | ||
20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
21 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
22 | #include <linux/netdevice.h> | 21 | #include <linux/netdevice.h> |
23 | #include <linux/etherdevice.h> | 22 | #include <linux/etherdevice.h> |
24 | #include <bcmdefs.h> | 23 | |
25 | #include <osl.h> | ||
26 | #include <proto/802.11.h> | 24 | #include <proto/802.11.h> |
25 | #include <proto/802.1d.h> | ||
26 | #include <osl.h> | ||
27 | #include <bcmdefs.h> | ||
28 | #include <bcmdevs.h> | ||
27 | #include <bcmwifi.h> | 29 | #include <bcmwifi.h> |
28 | #include <bcmutils.h> | ||
29 | #include <siutils.h> | 30 | #include <siutils.h> |
31 | #include <bcmsrom.h> | ||
32 | #include <bcmotp.h> | ||
33 | #include <bcmutils.h> | ||
30 | #include <wlioctl.h> | 34 | #include <wlioctl.h> |
31 | #include <sbconfig.h> | 35 | #include <sbconfig.h> |
32 | #include <sbchipc.h> | 36 | #include <sbchipc.h> |
33 | #include <pcicfg.h> | 37 | #include <pcicfg.h> |
34 | #include <sbhndpio.h> | ||
35 | #include <sbhnddma.h> | 38 | #include <sbhnddma.h> |
36 | #include <hnddma.h> | 39 | #include <hnddma.h> |
37 | #include <hndpmu.h> | 40 | #include <hndpmu.h> |
38 | #include <d11.h> | 41 | |
39 | #include <wlc_rate.h> | 42 | #include "wlc_types.h" |
40 | #include <wlc_pub.h> | 43 | #include "sbhndpio.h" |
41 | #include <wlc_channel.h> | 44 | #include "d11.h" |
42 | #include <bcmsrom.h> | 45 | #include "wlc_cfg.h" |
43 | #include <wlc_key.h> | 46 | #include "wlc_rate.h" |
44 | #include <bcmdevs.h> | 47 | #include "wlc_scb.h" |
45 | /* BMAC_NOTE: a WLC_HIGH compile include of wlc.h adds in more structures and type | 48 | #include "wlc_pub.h" |
46 | * dependencies. Need to include these to files to allow a clean include of wlc.h | 49 | #include "wlc_key.h" |
47 | * with WLC_HIGH defined. | 50 | #include "wlc_phy_shim.h" |
48 | * At some point we may be able to skip the include of wlc.h and instead just | 51 | #include "phy/wlc_phy_hal.h" |
49 | * define a stub wlc_info and band struct to allow rpc calls to get the rpc handle. | 52 | #include "wlc_channel.h" |
50 | */ | 53 | #include "wlc_bsscfg.h" |
51 | #include <wlc_mac80211.h> | 54 | #include "wlc_mac80211.h" |
52 | #include <wlc_bmac.h> | 55 | #include "wl_export.h" |
53 | #include <wlc_phy_shim.h> | ||
54 | #include <wlc_phy_hal.h> | ||
55 | #include <wl_export.h> | ||
56 | #include "wl_ucode.h" | 56 | #include "wl_ucode.h" |
57 | #include "d11ucode_ext.h" | 57 | #include "d11ucode_ext.h" |
58 | #include <bcmotp.h> | 58 | #include "wlc_antsel.h" |
59 | 59 | #include "pcie_core.h" | |
60 | /* BMAC_NOTE: With WLC_HIGH defined, some fns in this file make calls to high level | 60 | #include "wlc_alloc.h" |
61 | * functions defined in the headers below. We should be eliminating those calls and | 61 | #include "wl_dbg.h" |
62 | * will be able to delete these include lines. | 62 | #include "wlc_bmac.h" |
63 | */ | ||
64 | #include <wlc_antsel.h> | ||
65 | |||
66 | #include <pcie_core.h> | ||
67 | |||
68 | #include <wlc_alloc.h> | ||
69 | #include <wl_dbg.h> | ||
70 | 63 | ||
71 | #define TIMER_INTERVAL_WATCHDOG_BMAC 1000 /* watchdog timer, in unit of ms */ | 64 | #define TIMER_INTERVAL_WATCHDOG_BMAC 1000 /* watchdog timer, in unit of ms */ |
72 | 65 | ||
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h b/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h index 301270f4002..0951574ea60 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h | |||
@@ -17,8 +17,6 @@ | |||
17 | #ifndef _WLC_BSSCFG_H_ | 17 | #ifndef _WLC_BSSCFG_H_ |
18 | #define _WLC_BSSCFG_H_ | 18 | #define _WLC_BSSCFG_H_ |
19 | 19 | ||
20 | #include <wlc_types.h> | ||
21 | |||
22 | /* Check if a particular BSS config is AP or STA */ | 20 | /* Check if a particular BSS config is AP or STA */ |
23 | #define BSSCFG_AP(cfg) (0) | 21 | #define BSSCFG_AP(cfg) (0) |
24 | #define BSSCFG_STA(cfg) (1) | 22 | #define BSSCFG_STA(cfg) (1) |
@@ -28,8 +26,6 @@ | |||
28 | /* forward declarations */ | 26 | /* forward declarations */ |
29 | typedef struct wlc_bsscfg wlc_bsscfg_t; | 27 | typedef struct wlc_bsscfg wlc_bsscfg_t; |
30 | 28 | ||
31 | #include <wlc_rate.h> | ||
32 | |||
33 | #define NTXRATE 64 /* # tx MPDUs rate is reported for */ | 29 | #define NTXRATE 64 /* # tx MPDUs rate is reported for */ |
34 | #define MAXMACLIST 64 /* max # source MAC matches */ | 30 | #define MAXMACLIST 64 /* max # source MAC matches */ |
35 | #define BCN_TEMPLATE_COUNT 2 | 31 | #define BCN_TEMPLATE_COUNT 2 |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c index d53a9587589..edfc392d75a 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c | |||
@@ -15,24 +15,33 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | #include <linux/string.h> | 18 | #include <linux/types.h> |
19 | #include <bcmdefs.h> | ||
20 | #include <wlc_cfg.h> | ||
21 | #include <osl.h> | ||
22 | #include <linux/module.h> | 19 | #include <linux/module.h> |
23 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
21 | |||
22 | #include <proto/802.1d.h> | ||
23 | #include <osl.h> | ||
24 | #include <bcmdefs.h> | ||
24 | #include <bcmutils.h> | 25 | #include <bcmutils.h> |
25 | #include <siutils.h> | 26 | #include <siutils.h> |
26 | #include <sbhndpio.h> | ||
27 | #include <sbhnddma.h> | 27 | #include <sbhnddma.h> |
28 | #include <wlioctl.h> | 28 | #include <wlioctl.h> |
29 | #include <wlc_pub.h> | 29 | |
30 | #include <wlc_key.h> | 30 | #include "wlc_types.h" |
31 | #include <wlc_mac80211.h> | 31 | #include "sbhndpio.h" |
32 | #include <wlc_bmac.h> | 32 | #include "d11.h" |
33 | #include <wlc_stf.h> | 33 | #include "wlc_cfg.h" |
34 | #include <wlc_channel.h> | 34 | #include "wlc_scb.h" |
35 | #include <wl_dbg.h> | 35 | #include "wlc_pub.h" |
36 | #include "wlc_key.h" | ||
37 | #include "phy/wlc_phy_hal.h" | ||
38 | #include "wlc_bmac.h" | ||
39 | #include "wlc_rate.h" | ||
40 | #include "wlc_channel.h" | ||
41 | #include "wlc_bsscfg.h" | ||
42 | #include "wlc_mac80211.h" | ||
43 | #include "wlc_stf.h" | ||
44 | #include "wl_dbg.h" | ||
36 | 45 | ||
37 | #define VALID_CHANNEL20_DB(wlc, val) wlc_valid_channel20_db((wlc)->cmi, val) | 46 | #define VALID_CHANNEL20_DB(wlc, val) wlc_valid_channel20_db((wlc)->cmi, val) |
38 | #define VALID_CHANNEL20_IN_BAND(wlc, bandunit, val) \ | 47 | #define VALID_CHANNEL20_IN_BAND(wlc, bandunit, val) \ |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_channel.h b/drivers/staging/brcm80211/brcmsmac/wlc_channel.h index 9b3bf11d445..b8dec5b39d8 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_channel.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_channel.h | |||
@@ -17,8 +17,6 @@ | |||
17 | #ifndef _WLC_CHANNEL_H_ | 17 | #ifndef _WLC_CHANNEL_H_ |
18 | #define _WLC_CHANNEL_H_ | 18 | #define _WLC_CHANNEL_H_ |
19 | 19 | ||
20 | #include <wlc_phy_hal.h> | ||
21 | |||
22 | #define WLC_TXPWR_DB_FACTOR 4 /* conversion for phy txpwr cacluations that use .25 dB units */ | 20 | #define WLC_TXPWR_DB_FACTOR 4 /* conversion for phy txpwr cacluations that use .25 dB units */ |
23 | 21 | ||
24 | struct wlc_info; | 22 | struct wlc_info; |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c index 77cd2c9f1dd..1d8434586d2 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c | |||
@@ -16,10 +16,11 @@ | |||
16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
17 | #include <linux/ctype.h> | 17 | #include <linux/ctype.h> |
18 | #include <linux/etherdevice.h> | 18 | #include <linux/etherdevice.h> |
19 | #include <linux/string.h> | 19 | #include <net/mac80211.h> |
20 | |||
21 | #include <proto/802.1d.h> | ||
20 | #include <bcmdefs.h> | 22 | #include <bcmdefs.h> |
21 | #include <bcmdevs.h> | 23 | #include <bcmdevs.h> |
22 | #include <wlc_cfg.h> | ||
23 | #include <osl.h> | 24 | #include <osl.h> |
24 | #include <bcmutils.h> | 25 | #include <bcmutils.h> |
25 | #include <bcmwifi.h> | 26 | #include <bcmwifi.h> |
@@ -27,29 +28,32 @@ | |||
27 | #include <pcicfg.h> | 28 | #include <pcicfg.h> |
28 | #include <bcmsrom.h> | 29 | #include <bcmsrom.h> |
29 | #include <wlioctl.h> | 30 | #include <wlioctl.h> |
30 | #include <sbhndpio.h> | ||
31 | #include <sbhnddma.h> | 31 | #include <sbhnddma.h> |
32 | #include <hnddma.h> | 32 | #include <hnddma.h> |
33 | #include <hndpmu.h> | 33 | #include <hndpmu.h> |
34 | #include <d11.h> | 34 | |
35 | #include <wlc_rate.h> | 35 | #include "sbhndpio.h" |
36 | #include <wlc_pub.h> | 36 | #include "d11.h" |
37 | #include <wlc_key.h> | 37 | #include "wlc_types.h" |
38 | #include <wlc_bsscfg.h> | 38 | #include "wlc_cfg.h" |
39 | #include <wlc_channel.h> | 39 | #include "wlc_rate.h" |
40 | #include <wlc_mac80211.h> | 40 | #include "wlc_scb.h" |
41 | #include <wlc_bmac.h> | 41 | #include "wlc_pub.h" |
42 | #include <wlc_scb.h> | 42 | #include "wlc_key.h" |
43 | #include <wlc_phy_hal.h> | 43 | #include "wlc_bsscfg.h" |
44 | #include <wlc_phy_shim.h> | 44 | #include "phy/wlc_phy_hal.h" |
45 | #include <wlc_antsel.h> | 45 | #include "wlc_channel.h" |
46 | #include <wlc_stf.h> | 46 | #include "wlc_mac80211.h" |
47 | #include <wlc_ampdu.h> | 47 | #include "wlc_bmac.h" |
48 | #include <wl_export.h> | 48 | #include "wlc_phy_hal.h" |
49 | #include "wlc_phy_shim.h" | ||
50 | #include "wlc_antsel.h" | ||
51 | #include "wlc_stf.h" | ||
52 | #include "wlc_ampdu.h" | ||
53 | #include "wl_export.h" | ||
49 | #include "d11ucode_ext.h" | 54 | #include "d11ucode_ext.h" |
50 | #include <wlc_alloc.h> | 55 | #include "wlc_alloc.h" |
51 | #include <net/mac80211.h> | 56 | #include "wl_dbg.h" |
52 | #include <wl_dbg.h> | ||
53 | 57 | ||
54 | /* | 58 | /* |
55 | * Disable statistics counting for WME | 59 | * Disable statistics counting for WME |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.h b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.h index 72bfb8fa4d0..3914e2b18fa 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.h | |||
@@ -17,12 +17,6 @@ | |||
17 | #ifndef _wlc_h_ | 17 | #ifndef _wlc_h_ |
18 | #define _wlc_h_ | 18 | #define _wlc_h_ |
19 | 19 | ||
20 | #include <wlioctl.h> | ||
21 | #include <wlc_phy_hal.h> | ||
22 | #include <wlc_channel.h> | ||
23 | #include <wlc_bsscfg.h> | ||
24 | #include <wlc_scb.h> | ||
25 | |||
26 | #define MA_WINDOW_SZ 8 /* moving average window size */ | 20 | #define MA_WINDOW_SZ 8 /* moving average window size */ |
27 | #define WL_HWRXOFF 38 /* chip rx buffer offset */ | 21 | #define WL_HWRXOFF 38 /* chip rx buffer offset */ |
28 | #define INVCHANNEL 255 /* invalid channel */ | 22 | #define INVCHANNEL 255 /* invalid channel */ |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c index 4eaec04c527..ff595ab1173 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c | |||
@@ -22,38 +22,42 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
25 | #include <bcmdefs.h> | ||
26 | #include <wlc_cfg.h> | ||
27 | #include <linux/module.h> | 25 | #include <linux/module.h> |
28 | #include <linux/pci.h> | 26 | #include <linux/pci.h> |
29 | #include <osl.h> | ||
30 | #include <bcmutils.h> | ||
31 | 27 | ||
32 | #include <proto/802.11.h> | 28 | #include <proto/802.11.h> |
29 | #include <proto/802.1d.h> | ||
30 | #include <osl.h> | ||
31 | #include <bcmdefs.h> | ||
32 | #include <bcmutils.h> | ||
33 | #include <bcmwifi.h> | 33 | #include <bcmwifi.h> |
34 | #include <siutils.h> | 34 | #include <siutils.h> |
35 | #include <wlioctl.h> | 35 | #include <wlioctl.h> |
36 | #include <sbconfig.h> | 36 | #include <sbconfig.h> |
37 | #include <sbchipc.h> | 37 | #include <sbchipc.h> |
38 | #include <pcicfg.h> | 38 | #include <pcicfg.h> |
39 | #include <sbhndpio.h> | ||
40 | #include <sbhnddma.h> | 39 | #include <sbhnddma.h> |
41 | #include <hnddma.h> | 40 | #include <hnddma.h> |
42 | #include <hndpmu.h> | 41 | #include <hndpmu.h> |
43 | #include <d11.h> | 42 | |
44 | #include <wlc_rate.h> | 43 | #include "wlc_types.h" |
45 | #include <wlc_pub.h> | 44 | #include "wl_dbg.h" |
46 | #include <wlc_channel.h> | 45 | #include "sbhndpio.h" |
47 | #include <bcmsrom.h> | 46 | #include "wlc_cfg.h" |
48 | #include <wlc_key.h> | 47 | #include "d11.h" |
49 | 48 | #include "wlc_rate.h" | |
50 | #include <wlc_mac80211.h> | 49 | #include "wlc_scb.h" |
51 | 50 | #include "wlc_pub.h" | |
52 | #include <wlc_bmac.h> | 51 | #include "phy/wlc_phy_hal.h" |
53 | #include <wlc_phy_shim.h> | 52 | #include "wlc_channel.h" |
54 | #include <wlc_phy_hal.h> | 53 | #include "bcmsrom.h" |
55 | #include <wl_export.h> | 54 | #include "wlc_key.h" |
56 | #include <wl_dbg.h> | 55 | #include "wlc_bmac.h" |
56 | #include "wlc_phy_hal.h" | ||
57 | #include "wl_export.h" | ||
58 | #include "wlc_bsscfg.h" | ||
59 | #include "wlc_mac80211.h" | ||
60 | #include "wlc_phy_shim.h" | ||
57 | 61 | ||
58 | /* PHY SHIM module specific state */ | 62 | /* PHY SHIM module specific state */ |
59 | struct wlc_phy_shim_info { | 63 | struct wlc_phy_shim_info { |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_pub.h b/drivers/staging/brcm80211/brcmsmac/wlc_pub.h index d4d3cd21f80..af5d82ca3d2 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_pub.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_pub.h | |||
@@ -17,10 +17,6 @@ | |||
17 | #ifndef _wlc_pub_h_ | 17 | #ifndef _wlc_pub_h_ |
18 | #define _wlc_pub_h_ | 18 | #define _wlc_pub_h_ |
19 | 19 | ||
20 | #include <wlioctl.h> | ||
21 | #include <wlc_types.h> | ||
22 | #include <wlc_scb.h> | ||
23 | |||
24 | #define WLC_NUMRATES 16 /* max # of rates in a rateset */ | 20 | #define WLC_NUMRATES 16 /* max # of rates in a rateset */ |
25 | #define MAXMULTILIST 32 /* max # multicast addresses */ | 21 | #define MAXMULTILIST 32 /* max # multicast addresses */ |
26 | #define D11_PHY_HDR_LEN 6 /* Phy header length - 6 bytes */ | 22 | #define D11_PHY_HDR_LEN 6 /* Phy header length - 6 bytes */ |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c index d48dd47ef84..a8e30016a65 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c | |||
@@ -14,21 +14,25 @@ | |||
14 | * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 14 | * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
15 | */ | 15 | */ |
16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
17 | #include <linux/module.h> | ||
18 | |||
19 | #include <proto/802.11.h> | ||
20 | #include <proto/802.1d.h> | ||
17 | #include <bcmdefs.h> | 21 | #include <bcmdefs.h> |
18 | #include <wlc_cfg.h> | ||
19 | #include <osl.h> | 22 | #include <osl.h> |
20 | #include <linux/module.h> | ||
21 | #include <bcmutils.h> | 23 | #include <bcmutils.h> |
22 | #include <siutils.h> | 24 | #include <siutils.h> |
23 | #include <wlioctl.h> | 25 | #include <wlioctl.h> |
24 | |||
25 | #include <sbhndpio.h> | ||
26 | #include <sbhnddma.h> | 26 | #include <sbhnddma.h> |
27 | #include <proto/802.11.h> | 27 | |
28 | #include <d11.h> | 28 | #include "wlc_types.h" |
29 | #include <wlc_rate.h> | 29 | #include "sbhndpio.h" |
30 | #include <wl_dbg.h> | 30 | #include "d11.h" |
31 | #include <wlc_pub.h> | 31 | #include "wl_dbg.h" |
32 | #include "wlc_cfg.h" | ||
33 | #include "wlc_scb.h" | ||
34 | #include "wlc_pub.h" | ||
35 | #include "wlc_rate.h" | ||
32 | 36 | ||
33 | /* Rate info per rate: It tells whether a rate is ofdm or not and its phy_rate value */ | 37 | /* Rate info per rate: It tells whether a rate is ofdm or not and its phy_rate value */ |
34 | const u8 rate_info[WLC_MAXRATE + 1] = { | 38 | const u8 rate_info[WLC_MAXRATE + 1] = { |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_scb.h b/drivers/staging/brcm80211/brcmsmac/wlc_scb.h index 142b7567444..73260068898 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_scb.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_scb.h | |||
@@ -17,8 +17,6 @@ | |||
17 | #ifndef _wlc_scb_h_ | 17 | #ifndef _wlc_scb_h_ |
18 | #define _wlc_scb_h_ | 18 | #define _wlc_scb_h_ |
19 | 19 | ||
20 | #include <proto/802.1d.h> | ||
21 | |||
22 | extern bool wlc_aggregatable(struct wlc_info *wlc, u8 tid); | 20 | extern bool wlc_aggregatable(struct wlc_info *wlc, u8 tid); |
23 | 21 | ||
24 | #define AMPDU_TX_BA_MAX_WSIZE 64 /* max Tx ba window size (in pdu) */ | 22 | #define AMPDU_TX_BA_MAX_WSIZE 64 /* max Tx ba window size (in pdu) */ |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c index 46556ead78c..6574fb4d693 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c | |||
@@ -16,28 +16,34 @@ | |||
16 | 16 | ||
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
19 | #include <wlc_cfg.h> | 19 | |
20 | #include <proto/802.11.h> | ||
21 | #include <proto/802.1d.h> | ||
22 | |||
20 | #include <bcmdefs.h> | 23 | #include <bcmdefs.h> |
21 | #include <osl.h> | 24 | #include <osl.h> |
22 | #include <bcmutils.h> | 25 | #include <bcmutils.h> |
23 | #include <siutils.h> | 26 | #include <siutils.h> |
24 | #include <proto/802.11.h> | ||
25 | #include <wlioctl.h> | 27 | #include <wlioctl.h> |
26 | #include <bcmwifi.h> | 28 | #include <bcmwifi.h> |
27 | #include <sbhndpio.h> | ||
28 | #include <sbhnddma.h> | 29 | #include <sbhnddma.h> |
29 | #include <d11.h> | 30 | |
30 | #include <wlc_rate.h> | 31 | #include "wlc_types.h" |
31 | #include <wlc_pub.h> | 32 | #include "sbhndpio.h" |
32 | #include <wlc_key.h> | 33 | #include "d11.h" |
33 | #include <wlc_channel.h> | 34 | #include "wl_dbg.h" |
34 | #include <wlc_bsscfg.h> | 35 | #include "wlc_cfg.h" |
35 | #include <wlc_mac80211.h> | 36 | #include "wlc_rate.h" |
36 | #include <wlc_scb.h> | 37 | #include "wlc_scb.h" |
37 | #include <wl_export.h> | 38 | #include "wlc_pub.h" |
38 | #include <wlc_bmac.h> | 39 | #include "wlc_key.h" |
39 | #include <wlc_stf.h> | 40 | #include "phy/wlc_phy_hal.h" |
40 | #include <wl_dbg.h> | 41 | #include "wlc_channel.h" |
42 | #include "wlc_bsscfg.h" | ||
43 | #include "wlc_mac80211.h" | ||
44 | #include "wl_export.h" | ||
45 | #include "wlc_bmac.h" | ||
46 | #include "wlc_stf.h" | ||
41 | 47 | ||
42 | #define MIN_SPATIAL_EXPANSION 0 | 48 | #define MIN_SPATIAL_EXPANSION 0 |
43 | #define MAX_SPATIAL_EXPANSION 1 | 49 | #define MAX_SPATIAL_EXPANSION 1 |