From 84349df5699b784305acfac64a65962b3e158ad5 Mon Sep 17 00:00:00 2001
From: Franky Lin <frankyl@broadcom.com>
Date: Fri, 16 Sep 2011 12:27:54 -0700
Subject: [PATCH] --- yaml --- r: 268474 b: refs/heads/master c:
 24d7d5e8a8c54ddf0085cc69237e8b083f908ce2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 836863e5ef76..6e1d612c70a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82553d9ba35a592e3217d8e657d2e6032375fdea
+refs/heads/master: 24d7d5e8a8c54ddf0085cc69237e8b083f908ce2
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h b/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
index 329851ca43b4..5316df9a24b4 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_roam;
-
 /* Roaming mode control */
 extern uint brcmf_radio_up;
 
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
index 5ae4a408f75b..c02c8cd46721 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
@@ -794,6 +794,7 @@ int brcmf_c_preinit_ioctls(struct brcmf_pub *drvr)
 	char buf[128], *ptr;
 	u32 dongle_align = BRCMF_SDALIGN;
 	u32 glom = 0;
+	u32 roaming = 1;
 	uint bcn_timeout = 3;
 	int scan_assoc_time = 40;
 	int scan_unassoc_time = 40;
@@ -838,7 +839,7 @@ int brcmf_c_preinit_ioctls(struct brcmf_pub *drvr)
 
 	/* Enable/Disable build-in roaming to allowed ext supplicant to take
 		 of romaing */
-	brcmu_mkiovar("roam_off", (char *)&brcmf_roam, 4,
+	brcmu_mkiovar("roam_off", (char *)&roaming, 4,
 		      iovbuf, sizeof(iovbuf));
 	brcmf_proto_cdc_set_ioctl(drvr, 0, BRCMF_C_SET_VAR, iovbuf,
 				  sizeof(iovbuf));
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index 8e729d82e16c..f462a5f1a43e 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);
 
-/* Contorl fw roaming */
-uint brcmf_roam = 1;
-
 /* Control radio state */
 uint brcmf_radio_up = 1;