diff options
| author | Arend van Spriel <[email protected]> | 2011-06-29 16:46:40 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2011-07-05 09:57:11 -0700 |
| commit | edb3f7cf0415ec6ca51dcfd6d8c4337a078a708a (patch) | |
| tree | 308750237ad62e87ef468117a4ed46c453f63651 | |
| parent | 5b5195a57b8144a59e7c0cf9599aeeaac6afaa8a (diff) | |
staging: brcm80211: remove macro FOREACH_AS_STA
The macro definition FOREACH_AS_STA does an assignment inside the
if condition, which is considered a checkpatch error. It has been
removed.
Signed-off-by: Arend van Spriel <[email protected]>
Reviewed-by: Roland Vossen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/main.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/main.c b/drivers/staging/brcm80211/brcmsmac/main.c index 093f3bf24537..f7ebaf18d044 100644 --- a/drivers/staging/brcm80211/brcmsmac/main.c +++ b/drivers/staging/brcm80211/brcmsmac/main.c @@ -252,12 +252,6 @@ const u8 wlc_prio2prec_map[] = { #define BSSCFG_STA(cfg) (1) #define BSSCFG_IBSS(cfg) (!(cfg)->BSS) -/* Iterator for "associated" STA bss configs: - (struct brcms_c_info *wlc, int idx, struct brcms_c_bsscfg *cfg) */ -#define FOREACH_AS_STA(wlc, idx, cfg) \ - for (idx = 0; (int) idx < WLC_MAXBSSCFG; idx++) \ - if ((cfg = (wlc)->bsscfg[idx]) && BSSCFG_STA(cfg) && cfg->associated) - /* As above for all non-NULL BSS configs */ #define FOREACH_BSS(wlc, idx, cfg) \ for (idx = 0; (int) idx < WLC_MAXBSSCFG; idx++) \ @@ -396,13 +390,19 @@ bool brcms_c_ps_allowed(struct brcms_c_info *wlc) if (AP_ACTIVE(wlc) || wlc->monitor) return false; - FOREACH_AS_STA(wlc, idx, cfg) { - /* disallow PS when one of the following bsscfg specific conditions meets */ - if (!cfg->BSS || !WLC_PORTOPEN(cfg)) - return false; + for (idx = 0; idx < WLC_MAXBSSCFG; idx++) { + cfg = wlc->bsscfg[idx]; + if (cfg && BSSCFG_STA(cfg) && cfg->associated) { + /* + * disallow PS when one of the following + * bsscfg specific conditions meets + */ + if (!cfg->BSS || !WLC_PORTOPEN(cfg)) + return false; - if (!cfg->dtim_programmed) - return false; + if (!cfg->dtim_programmed) + return false; + } } return true; @@ -1060,8 +1060,11 @@ static void WLBANDINITFN(brcms_c_setband) (struct brcms_c_info *wlc, return; /* wait for at least one beacon before entering sleeping state */ - FOREACH_AS_STA(wlc, idx, cfg) - cfg->PMawakebcn = true; + for (idx = 0; idx < WLC_MAXBSSCFG; idx++) { + cfg = wlc->bsscfg[idx]; + if (cfg && BSSCFG_STA(cfg) && cfg->associated) + cfg->PMawakebcn = true; + } brcms_c_set_ps_ctrl(wlc); /* band-specific initializations */ |