Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45575664 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: remove nested include statements 



In order to analyze include file usage nested includes have been
removed from the driver sources.

Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarBrett Rudley <brudley@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 62b54dca

drivers/staging/brcm80211/brcmsmac/wl_mac80211.c

+19 −19
Original line number Diff line number Diff line
@@ -18,35 +18,35 @@ 


#include <linux/kernel.h>

#include <linux/etherdevice.h>

#include <linux/string.h>

#include <linux/types.h>

#include <linux/pci_ids.h>

#include <bcmdefs.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/sched.h>

#include <osl.h>

#define WLC_MAXBSSCFG		1	/* single BSS configs */



#include <wlc_cfg.h>

#include <linux/firmware.h>

#include <net/mac80211.h>

#include <phy_version.h>



#include <proto/802.1d.h>

#include <bcmdefs.h>

#include <osl.h>

#include <bcmutils.h>

#include <pcicfg.h>

#include <wlioctl.h>

#include <wlc_key.h>

#include <sbhndpio.h>

#include <sbhnddma.h>

#include <wlc_channel.h>

#include <wlc_pub.h>

#include <wlc_scb.h>

#include <wl_dbg.h>

#include <wl_export.h>



#include <wl_mac80211.h>

#include <linux/firmware.h>

#include <wl_ucode.h>

#include <d11ucode_ext.h>



#include "wlc_cfg.h"

#include "phy/phy_version.h"

#include "wlc_key.h"

#include "sbhndpio.h"

#include "phy/wlc_phy_hal.h"

#include "wlc_channel.h"

#include "wlc_scb.h"

#include "wlc_pub.h"

#include "wl_dbg.h"

#include "wl_export.h"

#include "wl_ucode.h"

#include "d11ucode_ext.h"

#include "wl_mac80211.h"



static void wl_timer(unsigned long data);

static void _wl_timer(wl_timer_t *t);

drivers/staging/brcm80211/brcmsmac/wl_mac80211.h

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
#ifndef _wl_mac80211_h_

#define _wl_mac80211_h_



#include <wlc_types.h>



/* BMAC Note: High-only driver is no longer working in softirq context as it needs to block and

 * sleep so perimeter lock has to be a semaphore instead of spinlock. This requires timers to be

 * submitted to workqueue instead of being on kernel timer

drivers/staging/brcm80211/brcmsmac/wlc_alloc.c

+19 −11
Original line number Diff line number Diff line
@@ -14,22 +14,30 @@ 
 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */

#include <linux/kernel.h>

#include <linux/string.h>

#include <bcmdefs.h>

#include <wlc_cfg.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/types.h>



#include <proto/802.1d.h>

#include <osl.h>

#include <bcmdefs.h>

#include <bcmutils.h>

#include <siutils.h>

#include <wlioctl.h>

#include <wlc_pub.h>

#include <wlc_key.h>

#include <sbhndpio.h>

#include <sbhnddma.h>

#include <wlc_mac80211.h>

#include <wlc_alloc.h>

#include <wl_dbg.h>



#include "sbhndpio.h"

#include "d11.h"

#include "wlc_types.h"

#include "wlc_cfg.h"

#include "wlc_scb.h"

#include "wlc_pub.h"

#include "wlc_key.h"

#include "wlc_alloc.h"

#include "wl_dbg.h"

#include "wlc_rate.h"

#include "wlc_bsscfg.h"

#include "phy/wlc_phy_hal.h"

#include "wlc_channel.h"

#include "wlc_mac80211.h"



static struct wlc_bsscfg *wlc_bsscfg_malloc(struct osl_info *osh, uint unit);

static void wlc_bsscfg_mfree(struct osl_info *osh, struct wlc_bsscfg *cfg);

drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c

+19 −13
Original line number Diff line number Diff line
@@ -14,9 +14,11 @@ 
 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */

#include <linux/kernel.h>

#include <wlc_cfg.h>

#include <bcmdefs.h>

#include <net/mac80211.h>



#include <proto/802.1d.h>

#include <osl.h>

#include <bcmdefs.h>

#include <bcmutils.h>

#include <siutils.h>

#include <wlioctl.h>
@@ -24,17 +26,21 @@ 
#include <sbhnddma.h>

#include <hnddma.h>

#include <d11.h>

#include <wlc_rate.h>

#include <wlc_pub.h>

#include <wlc_key.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>



#include "wlc_types.h"

#include "wlc_cfg.h"

#include "wlc_rate.h"

#include "wlc_scb.h"

#include "wlc_pub.h"

#include "wlc_key.h"

#include "phy/wlc_phy_hal.h"

#include "wlc_antsel.h"

#include "wl_export.h"

#include "wl_dbg.h"

#include "wlc_bsscfg.h"

#include "wlc_channel.h"

#include "wlc_mac80211.h"

#include "wlc_ampdu.h"



/*

 *	Disable AMPDU statistics counters for now

drivers/staging/brcm80211/brcmsmac/wlc_antsel.c

+20 −15
Original line number Diff line number Diff line
@@ -21,26 +21,31 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <bcmdefs.h>



#include <proto/802.1d.h>

#include <osl.h>

#include <bcmdefs.h>

#include <bcmutils.h>

#include <siutils.h>

#include <wlioctl.h>



#include <bcmdevs.h>

#include <sbhndpio.h>

#include <sbhnddma.h>

#include <d11.h>

#include <wlc_rate.h>

#include <wlc_key.h>

#include <wlc_pub.h>

#include <wl_dbg.h>

#include <wlc_mac80211.h>

#include <wlc_bmac.h>

#include <wlc_phy_hal.h>

#include <wl_export.h>

#include <wlc_antsel.h>

#include <wlc_phy_shim.h>

#include <wlioctl.h>



#include "sbhndpio.h"

#include "d11.h"

#include "wlc_rate.h"

#include "wlc_key.h"

#include "wlc_scb.h"

#include "wlc_pub.h"

#include "wl_dbg.h"

#include "phy/wlc_phy_hal.h"

#include "wlc_bmac.h"

#include "wlc_channel.h"

#include "wlc_bsscfg.h"

#include "wlc_mac80211.h"

#include "wl_export.h"

#include "wlc_phy_shim.h"

#include "wlc_antsel.h"



/* useful macros */

#define WLC_ANTSEL_11N_0(ant)	((((ant) & ANT_SELCFG_MASK) >> 4) & 0xf)