From bfde6c0211f6b0811e1ab5eba12bd48dbfa12c42 Mon Sep 17 00:00:00 2001
From: nohee ko <noheek@broadcom.com>
Date: Sun, 17 Oct 2010 10:33:19 -0700
Subject: [PATCH] --- yaml --- r: 220400 b: refs/heads/master c:
 f49200c36738a315eb094a3ed8260f00d1bafee0 h: refs/heads/master v: v3

---
 [refs]                                                 |  2 +-
 trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index d703deb92237..3f156c891d26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd384c2722428498669840db44c6a7aafab54c29
+refs/heads/master: f49200c36738a315eb094a3ed8260f00d1bafee0
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index 20367a0c0e6a..eea647ce8a4e 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@ -3108,18 +3108,10 @@ static s32 wl_init_priv(struct wl_priv *wl)
 
 	wl->scan_request = NULL;
 	wl->pwr_save = !!(wiphy->flags & WIPHY_FLAG_PS_ON_BY_DEFAULT);
-#ifndef WL_ISCAN_DISABLED
 	wl->iscan_on = true;	/* iscan on & off switch.
 				 we enable iscan per default */
-#else
-	wl->iscan_on = false;
-#endif				/* WL_ISCAN_DISABLED */
-#ifndef WL_ROAM_DISABLED
-	wl->roam_on = true;	/* roam on & off switch.
+	wl->roam_on = false;	/* roam on & off switch.
 				 we enable roam per default */
-#else
-	wl->roam_on = false;
-#endif				/* WL_ROAM_DISABLED */
 
 	wl->iscan_kickstart = false;
 	wl->active_scan = true;	/* we do active scan for