From 1731dcc9cd8cdc394237bca782aa8178ae635e1f Mon Sep 17 00:00:00 2001
From: Franky Lin <frankyl@broadcom.com>
Date: Fri, 16 Sep 2011 12:27:55 -0700
Subject: [PATCH] --- yaml --- r: 268475 b: refs/heads/master c:
 bb450766c367d364b4729f39ce08cece253d7385 h: refs/heads/master i:   268473:
 36fb9975d3ee3cd1dc6f5e884658375661da22ce   268471:
 3a5894f9d862663ec74a0f63f6a3d70f04d42b37 v: v3

---
 [refs]                                                | 2 +-
 trunk/drivers/staging/brcm80211/brcmfmac/dhd.h        | 3 ---
 trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c | 4 +---
 trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c  | 3 ---
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 6e1d612c70a1..8e5ad0a83c7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24d7d5e8a8c54ddf0085cc69237e8b083f908ce2
+refs/heads/master: bb450766c367d364b4729f39ce08cece253d7385
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h b/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
index 5316df9a24b4..2967ada0cb60 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
@@ -673,9 +673,6 @@ extern uint brcmf_arp_mode;
 /* ARP offload enable */
 extern uint brcmf_arp_enable;
 
-/* Roaming mode control */
-extern uint brcmf_radio_up;
-
 /* Override to force tx queueing all the time */
 extern uint brcmf_force_tx_queueing;
 
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
index c02c8cd46721..2e8db6256502 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
@@ -845,9 +845,7 @@ int brcmf_c_preinit_ioctls(struct brcmf_pub *drvr)
 				  sizeof(iovbuf));
 
 	/* Force STA UP */
-	if (brcmf_radio_up)
-		brcmf_proto_cdc_set_ioctl(drvr, 0, BRCMF_C_UP, (char *)&up,
-					  sizeof(up));
+	brcmf_proto_cdc_set_ioctl(drvr, 0, BRCMF_C_UP, (char *)&up, sizeof(up));
 
 	/* Setup event_msgs */
 	brcmu_mkiovar("event_msgs", drvr->eventmask, BRCMF_EVENTING_MASK_LEN,
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index f462a5f1a43e..16f7216098f1 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -98,9 +98,6 @@ module_param(brcmf_arp_mode, uint, 0);
 uint brcmf_arp_enable = true;
 module_param(brcmf_arp_enable, uint, 0);
 
-/* Control radio state */
-uint brcmf_radio_up = 1;
-
 /* Network inteface name */
 char iface_name[IFNAMSIZ] = "wlan";
 module_param_string(iface_name, iface_name, IFNAMSIZ, 0);