From: nohee ko Date: Sun, 17 Oct 2010 17:33:19 +0000 (-0700) Subject: staging: brcm80211: brcmfmac: remove unnecessary cflags, WL_ISCAN_DISABLED & WL_ROAM_... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f49200c36738a315eb094a3ed8260f00d1bafee0;p=linux-beck.git 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 Signed-off-by: Greg Kroah-Hartman --- 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