From 5f9638aad9c579be9a7d8517debdfdadea6a8617 Mon Sep 17 00:00:00 2001
From: Franky Lin <frankyl@broadcom.com>
Date: Thu, 1 Sep 2011 11:17:09 +0200
Subject: [PATCH] --- yaml --- r: 268231 b: refs/heads/master c:
 debc71cd897b63880385e208e83714cb028e2177 h: refs/heads/master i:   268229:
 a2495be0e72c4283455fe8e4122baaa8b3d7c716   268227:
 b70ef95bcd4031ea915d67882f3d802e9c9373a8   268223:
 da8ccb8ab22432a8fefa99715553951719b99b73 v: v3

---
 [refs]                                        |  2 +-
 .../staging/brcm80211/brcmfmac/dhd_linux.c    | 40 ++++++++-----------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index dadd836b4f0d..467758a273bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc4fbdadc1ed7ec9d8d4493da85dafb4888e2593
+refs/heads/master: debc71cd897b63880385e208e83714cb028e2177
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index 46f75b7f7bef..7121b1658e95 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -120,12 +120,6 @@ uint brcmf_radio_up = 1;
 char iface_name[IFNAMSIZ] = "wlan";
 module_param_string(iface_name, iface_name, IFNAMSIZ, 0);
 
-static int brcmf_toe_get(struct brcmf_info *drvr_priv, int idx, u32 *toe_ol);
-static int brcmf_toe_set(struct brcmf_info *drvr_priv, int idx, u32 toe_ol);
-static int brcmf_host_event(struct brcmf_info *drvr_priv, int *ifidx,
-			    void *pktdata, struct brcmf_event_msg *event_ptr,
-			    void **data_ptr);
-
 static int brcmf_net2idx(struct brcmf_info *drvr_priv, struct net_device *net)
 {
 	int i = 0;
@@ -600,6 +594,23 @@ void brcmf_txflowcontrol(struct brcmf_pub *drvr, int ifidx, bool state)
 		netif_wake_queue(net);
 }
 
+static int brcmf_host_event(struct brcmf_info *drvr_priv, int *ifidx,
+			    void *pktdata, struct brcmf_event_msg *event,
+			    void **data)
+{
+	int bcmerror = 0;
+
+	bcmerror = brcmf_c_host_event(drvr_priv, ifidx, pktdata, event, data);
+	if (bcmerror != 0)
+		return bcmerror;
+
+	if (drvr_priv->iflist[*ifidx]->net)
+		brcmf_cfg80211_event(drvr_priv->iflist[*ifidx]->net,
+				     event, *data);
+
+	return bcmerror;
+}
+
 void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx, struct sk_buff *skb,
 		  int numpkt)
 {
@@ -1483,23 +1494,6 @@ int brcmf_os_proto_unblock(struct brcmf_pub *drvr)
 	return 0;
 }
 
-static int brcmf_host_event(struct brcmf_info *drvr_priv, int *ifidx,
-			    void *pktdata, struct brcmf_event_msg *event,
-			    void **data)
-{
-	int bcmerror = 0;
-
-	bcmerror = brcmf_c_host_event(drvr_priv, ifidx, pktdata, event, data);
-	if (bcmerror != 0)
-		return bcmerror;
-
-	if (drvr_priv->iflist[*ifidx]->net)
-		brcmf_cfg80211_event(drvr_priv->iflist[*ifidx]->net,
-				     event, *data);
-
-	return bcmerror;
-}
-
 int brcmf_netdev_reset(struct net_device *dev, u8 flag)
 {
 	struct brcmf_info *drvr_priv = *(struct brcmf_info **)netdev_priv(dev);