From 51ac725df13bb52da712fe025b14b133299aae9f Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Wed, 19 Sep 2012 22:21:18 +0200
Subject: [PATCH] --- yaml --- r: 328253 b: refs/heads/master c:
 ee928381ec9ec089c4ac35e7aeaaeb5bc4ccd938 h: refs/heads/master i:   328251:
 b6be10a20c7374cf533f4226c93a54659e73e64c v: v3

---
 [refs]                                                      | 2 +-
 trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 4 ++--
 trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a8a26f26d93a..6f2ac38d322a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02030eb61d2737c7e6a2b75506b57608d86199c5
+refs/heads/master: ee928381ec9ec089c4ac35e7aeaaeb5bc4ccd938
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index 078e293c05ed..e40cfe846a48 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -4266,7 +4266,7 @@ static void wl_deinit_priv(struct brcmf_cfg80211_priv *cfg_priv)
 
 struct brcmf_cfg80211_dev *brcmf_cfg80211_attach(struct net_device *ndev,
 						 struct device *busdev,
-						 void *data)
+						 struct brcmf_pub *drvr)
 {
 	struct wireless_dev *wdev;
 	struct brcmf_cfg80211_priv *cfg_priv;
@@ -4291,7 +4291,7 @@ struct brcmf_cfg80211_dev *brcmf_cfg80211_attach(struct net_device *ndev,
 	wdev->iftype = brcmf_mode_to_nl80211_iftype(WL_MODE_BSS);
 	cfg_priv = wdev_to_cfg(wdev);
 	cfg_priv->wdev = wdev;
-	cfg_priv->pub = data;
+	cfg_priv->pub = drvr;
 	ci = (struct brcmf_cfg80211_iface *)&cfg_priv->ci;
 	ci->cfg_priv = cfg_priv;
 	ndev->ieee80211_ptr = wdev;
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h b/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
index a2138c185c65..52e408ed6f41 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
@@ -438,7 +438,7 @@ struct brcmf_cfg80211_priv {
 	struct brcmf_cfg80211_pmk_list *pmk_list;
 	struct work_struct event_work;
 	unsigned long status;
-	void *pub;
+	struct brcmf_pub *pub;
 	u32 channel;
 	bool iscan_on;
 	bool iscan_kickstart;
@@ -497,7 +497,7 @@ brcmf_cfg80211_connect_info *cfg_to_conn(struct brcmf_cfg80211_priv *cfg)
 
 extern struct brcmf_cfg80211_dev *brcmf_cfg80211_attach(struct net_device *ndev,
 							struct device *busdev,
-							void *data);
+							struct brcmf_pub *drvr);
 extern void brcmf_cfg80211_detach(struct brcmf_cfg80211_dev *cfg);
 
 /* event handler from dongle */