staging: brcm80211: merged dngl_stats.h into dhd.h

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

@@ -29,7 +29,6 @@
 #include <soc.h>
 #include "bcmsdbus.h"		/* common SDIO/controller interface */
 #include "sbsdio.h"		/* BRCM sdio device core */
-#include "dngl_stats.h"
 #include "dhd.h"
 #include "dhd_bus.h"
 #include "sdio_host.h"

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

@@ -31,7 +31,6 @@
 #include <brcmu_wifi.h>
 #include "sdio_host.h"
 #include "bcmsdbus.h"
-#include "dngl_stats.h"
 #include "dhd.h"
 #include "dhd_dbg.h"
 #include "wl_cfg80211.h"

drivers/staging/brcm80211/brcmfmac/dhd.h

@@ -161,6 +161,18 @@ struct brcmf_event {
 	struct brcmf_event_msg msg;
 } __packed;
 
+struct dngl_stats {
+	unsigned long rx_packets;	/* total packets received */
+	unsigned long tx_packets;	/* total packets transmitted */
+	unsigned long rx_bytes;	/* total bytes received */
+	unsigned long tx_bytes;	/* total bytes transmitted */
+	unsigned long rx_errors;	/* bad packets received */
+	unsigned long tx_errors;	/* packet transmit problems */
+	unsigned long rx_dropped;	/* packets dropped by dongle */
+	unsigned long tx_dropped;	/* packets dropped by dongle */
+	unsigned long multicast;	/* multicast packets received */
+};
+
 #define BRCMF_E_SET_SSID			0
 #define BRCMF_E_JOIN				1
 #define BRCMF_E_START				2

drivers/staging/brcm80211/brcmfmac/dhd_cdc.c

@@ -22,7 +22,6 @@
 #include <brcmu_utils.h>
 #include <brcmu_wifi.h>
 
-#include "dngl_stats.h"
 #include "dhd.h"
 #include "dhd_proto.h"
 #include "dhd_bus.h"

drivers/staging/brcm80211/brcmfmac/dhd_common.c

@@ -21,7 +21,6 @@
 #include <defs.h>
 #include <brcmu_wifi.h>
 #include <brcmu_utils.h>
-#include "dngl_stats.h"
 #include "dhd.h"
 #include "dhd_bus.h"
 #include "dhd_proto.h"

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

@@ -33,7 +33,6 @@
 #include <brcmu_utils.h>
 #include <brcmu_wifi.h>
 
-#include "dngl_stats.h"
 #include "dhd.h"
 #include "dhd_bus.h"
 #include "dhd_proto.h"

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

@@ -152,7 +152,6 @@ struct rte_console {
 
 #include "sbsdio.h"
 
-#include "dngl_stats.h"
 #include "dhd.h"
 #include "dhd_bus.h"
 #include "dhd_proto.h"

drivers/staging/brcm80211/brcmfmac/dngl_stats.h

@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2010 Broadcom Corporation
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _dngl_stats_h_
-#define _dngl_stats_h_
-
-struct dngl_stats {
-	unsigned long rx_packets;	/* total packets received */
-	unsigned long tx_packets;	/* total packets transmitted */
-	unsigned long rx_bytes;	/* total bytes received */
-	unsigned long tx_bytes;	/* total bytes transmitted */
-	unsigned long rx_errors;	/* bad packets received */
-	unsigned long tx_errors;	/* packet transmit problems */
-	unsigned long rx_dropped;	/* packets dropped by dongle */
-	unsigned long tx_dropped;	/* packets dropped by dongle */
-	unsigned long multicast;	/* multicast packets received */
-};
-
-#endif				/* _dngl_stats_h_ */

drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c

@@ -31,7 +31,6 @@
 #include <brcmu_utils.h>
 #include <defs.h>
 #include <brcmu_wifi.h>
-#include "dngl_stats.h"
 #include "dhd.h"
 #include "wl_cfg80211.h"