From 51d8efa014c286c0d9a0341c289c27b16632c166 Mon Sep 17 00:00:00 2001
From: Roland Vossen <rvossen@broadcom.com>
Date: Tue, 7 Dec 2010 17:45:42 +0100
Subject: [PATCH] --- yaml --- r: 228314 b: refs/heads/master c:
 6cdeaef203155bd7f12d362e5345323cfecde58a h: refs/heads/master v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/staging/brcm80211/sys/wl_mac80211.c  | 2 +-
 trunk/drivers/staging/brcm80211/sys/wlc_mac80211.h | 2 +-
 trunk/drivers/staging/brcm80211/sys/wlc_types.h    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 54bbdc9bcf6c..a0674f7233af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d65ddb58325ba2c4fef70f6c9ff542df81e5cdb3
+refs/heads/master: 6cdeaef203155bd7f12d362e5345323cfecde58a
diff --git a/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c b/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c
index d41212bca633..1e7a29d006be 100644
--- a/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c
+++ b/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c
@@ -98,7 +98,7 @@ struct ieee80211_tkip_data {
 	u8 rx_hdr[16], tx_hdr[16];
 };
 
-#define WL_DEV_IF(dev)		((wl_if_t *)netdev_priv(dev))
+#define WL_DEV_IF(dev)		((struct wl_if *)netdev_priv(dev))
 #define	WL_INFO(dev)		((struct wl_info *)(WL_DEV_IF(dev)->wl))
 static int wl_request_fw(struct wl_info *wl, struct pci_dev *pdev);
 static void wl_release_fw(struct wl_info *wl);
diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.h b/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.h
index bfd9ad4118ad..2054e346eab4 100644
--- a/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.h
+++ b/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.h
@@ -390,7 +390,7 @@ struct wlc_if {
 				 * AID2PVBMAP(scb).
 				 */
 	u8 flags;		/* flags for the interface */
-	wl_if_t *wlif;		/* pointer to wlif */
+	struct wl_if *wlif;		/* pointer to wlif */
 	struct wlc_txq_info *qi;	/* pointer to associated tx queue */
 	union {
 		struct scb *scb;	/* pointer to scb if WLC_IFTYPE_WDS */
diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_types.h b/trunk/drivers/staging/brcm80211/sys/wlc_types.h
index 5f63c48b00fd..7e2e198334ca 100644
--- a/trunk/drivers/staging/brcm80211/sys/wlc_types.h
+++ b/trunk/drivers/staging/brcm80211/sys/wlc_types.h
@@ -22,7 +22,7 @@
 struct wlc_info;
 struct wlc_hw_info;
 struct wlc_if;
-typedef struct wl_if wl_if_t;
+struct wl_if;
 struct ampdu_info;
 struct wlc_ap_info;
 struct antsel_info;