diff options
Diffstat (limited to 'drivers/staging/brcm80211/brcmsmac/wlc_bmac.c')
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | 63 |
1 files changed, 28 insertions, 35 deletions
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 | ||