summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornohee ko <noheek@broadcom.com>2010-10-17 10:33:19 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-19 10:54:51 -0700
commitf49200c36738a315eb094a3ed8260f00d1bafee0 (patch)
tree83bc84fd01e8ebe0e94b125ccde5bbce7defb6e4
parentbd384c2722428498669840db44c6a7aafab54c29 (diff)
downloadblackbird-op-linux-f49200c36738a315eb094a3ed8260f00d1bafee0.tar.gz
blackbird-op-linux-f49200c36738a315eb094a3ed8260f00d1bafee0.zip
staging: brcm80211: brcmfmac: remove unnecessary cflags, WL_ISCAN_DISABLED & WL_ROAM_DISABLED
Remove unnecessary cflags, WL_ISCAN_DISABLED and WL_ROAM_DISABLED. Iscan is ON and Roam by FW is OFF by default. Signed-off-by: Nohee Ko <noheek@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index 20367a0c0e6a..eea647ce8a4e 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/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
OpenPOWER on IntegriCloud