From 5f2abbe0157e24f102b61dbbf8745f453b9e882a Mon Sep 17 00:00:00 2001
From: Roland Vossen <rvossen@broadcom.com>
Date: Tue, 7 Dec 2010 17:45:45 +0100
Subject: [PATCH] --- yaml --- r: 228317 b: refs/heads/master c:
 c41c858f695b6626e2fc0729edc0dd26b091f354 h: refs/heads/master i:   228315:
 b0a2592976d8a170918850a2402994594ac36417 v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/staging/brcm80211/sys/wlc_alloc.c    | 3 ++-
 trunk/drivers/staging/brcm80211/sys/wlc_mac80211.h | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 84e610d62673..882145bd03d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f077f7185ce19adc234b96c6f9fb815301770c26
+refs/heads/master: c41c858f695b6626e2fc0729edc0dd26b091f354
diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_alloc.c b/trunk/drivers/staging/brcm80211/sys/wlc_alloc.c
index 09a1efd7b430..7d04d532a024 100644
--- a/trunk/drivers/staging/brcm80211/sys/wlc_alloc.c
+++ b/trunk/drivers/staging/brcm80211/sys/wlc_alloc.c
@@ -282,7 +282,8 @@ struct wlc_info *wlc_attach_malloc(struct osl_info *osh, uint unit, uint *err,
 		}
 	}
 
-	wlc->corestate = (wlccore_t *)wlc_calloc(osh, unit, sizeof(wlccore_t));
+	wlc->corestate = (struct wlccore *)wlc_calloc(osh, unit,
+						      sizeof(struct wlccore));
 	if (wlc->corestate == NULL) {
 		*err = 1026;
 		goto fail;
diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.h b/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.h
index acd854886df6..ba2b953800e3 100644
--- a/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.h
+++ b/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.h
@@ -302,7 +302,7 @@ typedef struct wlc_stf {
 /*
  * core state (mac)
  */
-typedef struct wlccore {
+struct wlccore {
 	uint coreidx;		/* # sb enumerated core */
 
 	/* fifo */
@@ -310,7 +310,7 @@ typedef struct wlccore {
 	s16 txpktpend[NFIFO];	/* tx admission control */
 
 	macstat_t *macstat_snapshot;	/* mac hw prev read values */
-} wlccore_t;
+};
 
 /*
  * band state (phy+ana+radio)
@@ -532,9 +532,9 @@ struct wlc_info {
 	bool clk;		/* core is out of reset and has clock */
 
 	/* multiband */
-	wlccore_t *core;	/* pointer to active io core */
+	struct wlccore *core;	/* pointer to active io core */
 	struct wlcband *band;	/* pointer to active per-band state */
-	wlccore_t *corestate;	/* per-core state (one per hw core) */
+	struct wlccore *corestate;	/* per-core state (one per hw core) */
 	/* per-band state (one per phy/radio): */
 	struct wlcband *bandstate[MAXBANDS];