---

yaml
---
r: 220400
b: refs/heads/master
c: f49200c
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd384c2722428498669840db44c6a7aafab54c29
+refs/heads/master: f49200c36738a315eb094a3ed8260f00d1bafee0

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