diff options
| author | Roland Vossen <rvossen@broadcom.com> | 2011-09-02 16:00:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 16:46:29 -0700 |
| commit | e95606562d640ebcdabf66f99b3af296487c0bc5 (patch) | |
| tree | 76cf1afaf43eafd504a1b3f8980ee381889efdeb /drivers/staging/brcm80211/brcmsmac/channel.c | |
| parent | c43f1e05bfd8aa39beecab83c7f812cb254fe625 (diff) | |
staging: brcm80211: cleaned up softmac pub.h macro's
Substituted/removed macro's.
Reported-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmsmac/channel.c')
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/channel.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/channel.c b/drivers/staging/brcm80211/brcmsmac/channel.c index e6afdc95acef..282adcefbb35 100644 --- a/drivers/staging/brcm80211/brcmsmac/channel.c +++ b/drivers/staging/brcm80211/brcmsmac/channel.c @@ -1010,7 +1010,8 @@ brcms_c_set_country_common(struct brcms_cm_info *wlc_cm, wlc->stf->no_cddstbc = true; } else { wlc->stf->no_cddstbc = false; - if (N_ENAB(wlc->pub) != wlc->protection->nmode_user) + if ((wlc->pub->_n_enab & SUPPORT_11N) != + wlc->protection->nmode_user) brcms_c_set_nmode(wlc, wlc->protection->nmode_user); } @@ -1137,7 +1138,8 @@ brcms_c_channel_locale_flags_in_band(struct brcms_cm_info *wlc_cm, static bool brcms_c_quiet_chanspec(struct brcms_cm_info *wlc_cm, u16 chspec) { - return N_ENAB(wlc_cm->wlc->pub) && CHSPEC_IS40(chspec) ? + return (wlc_cm->wlc->pub->_n_enab & SUPPORT_11N) && + CHSPEC_IS40(chspec) ? (isset(wlc_cm->quiet_channels.vec, LOWER_20_SB(CHSPEC_CHANNEL(chspec))) || isset(wlc_cm->quiet_channels.vec, |