diff options
author | Jason Cooper <jason@lakedaemon.net> | 2010-09-14 09:45:39 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-14 19:23:41 -0400 |
commit | 0d706ef4f2f17541900978b0c1cf629321f56298 (patch) | |
tree | b61f4f06d191f2cc1cc262ae237196a4358e4f30 /drivers/staging/brcm80211/sys | |
parent | 7e85c72969b17eed698c3e23674f424bf345aceb (diff) |
staging: brcm80211: fix "ERROR: Macros w/ complex values ... parenthesis"
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/sys')
-rw-r--r-- | drivers/staging/brcm80211/sys/wl_mac80211.c | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_ampdu.c | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_channel.c | 10 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_mac80211.h | 8 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_scb.h | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c index b6b4c6ad9e5..03eca6b8a48 100644 --- a/drivers/staging/brcm80211/sys/wl_mac80211.c +++ b/drivers/staging/brcm80211/sys/wl_mac80211.c | |||
@@ -229,8 +229,8 @@ module_param_string(name, name, IFNAMSIZ, 0); | |||
229 | 229 | ||
230 | #define WL_MAGIC 0xdeadbeef | 230 | #define WL_MAGIC 0xdeadbeef |
231 | 231 | ||
232 | #define HW_TO_WL(hw) hw->priv | 232 | #define HW_TO_WL(hw) (hw->priv) |
233 | #define WL_TO_HW(wl) wl->pub->ieee_hw | 233 | #define WL_TO_HW(wl) (wl->pub->ieee_hw) |
234 | #ifdef WLC_HIGH_ONLY | 234 | #ifdef WLC_HIGH_ONLY |
235 | static int wl_ops_tx_nl(struct ieee80211_hw *hw, struct sk_buff *skb); | 235 | static int wl_ops_tx_nl(struct ieee80211_hw *hw, struct sk_buff *skb); |
236 | #else | 236 | #else |
diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.c b/drivers/staging/brcm80211/sys/wlc_ampdu.c index a47cb981d30..d2eab6a89b6 100644 --- a/drivers/staging/brcm80211/sys/wlc_ampdu.c +++ b/drivers/staging/brcm80211/sys/wlc_ampdu.c | |||
@@ -69,7 +69,7 @@ | |||
69 | * accumulate between resets. | 69 | * accumulate between resets. |
70 | */ | 70 | */ |
71 | 71 | ||
72 | #define TX_SEQ_TO_INDEX(seq) (seq) % AMPDU_TX_BA_MAX_WSIZE | 72 | #define TX_SEQ_TO_INDEX(seq) ((seq) % AMPDU_TX_BA_MAX_WSIZE) |
73 | 73 | ||
74 | /* max possible overhead per mpdu in the ampdu; 3 is for roundup if needed */ | 74 | /* max possible overhead per mpdu in the ampdu; 3 is for roundup if needed */ |
75 | #define AMPDU_MAX_MPDU_OVERHEAD (DOT11_FCS_LEN + DOT11_ICV_AES_LEN + AMPDU_DELIMITER_LEN + 3 \ | 75 | #define AMPDU_MAX_MPDU_OVERHEAD (DOT11_FCS_LEN + DOT11_ICV_AES_LEN + AMPDU_DELIMITER_LEN + 3 \ |
diff --git a/drivers/staging/brcm80211/sys/wlc_channel.c b/drivers/staging/brcm80211/sys/wlc_channel.c index a1cf01bdc78..7824c8d89d6 100644 --- a/drivers/staging/brcm80211/sys/wlc_channel.c +++ b/drivers/staging/brcm80211/sys/wlc_channel.c | |||
@@ -190,12 +190,12 @@ static const chanvec_t restricted_set_12_13_14 = { | |||
190 | #define LOCALE_CHAN_52_140_ALL (1<<14) | 190 | #define LOCALE_CHAN_52_140_ALL (1<<14) |
191 | #define LOCALE_SET_5G_HIGH4 (1<<15) /* 184-216 */ | 191 | #define LOCALE_SET_5G_HIGH4 (1<<15) /* 184-216 */ |
192 | 192 | ||
193 | #define LOCALE_CHAN_36_64 LOCALE_SET_5G_LOW1 | LOCALE_SET_5G_LOW2 | LOCALE_SET_5G_LOW3 | 193 | #define LOCALE_CHAN_36_64 (LOCALE_SET_5G_LOW1 | LOCALE_SET_5G_LOW2 | LOCALE_SET_5G_LOW3) |
194 | #define LOCALE_CHAN_52_64 LOCALE_SET_5G_LOW2 | LOCALE_SET_5G_LOW3 | 194 | #define LOCALE_CHAN_52_64 (LOCALE_SET_5G_LOW2 | LOCALE_SET_5G_LOW3) |
195 | #define LOCALE_CHAN_100_124 LOCALE_SET_5G_MID1 | LOCALE_SET_5G_MID2 | 195 | #define LOCALE_CHAN_100_124 (LOCALE_SET_5G_MID1 | LOCALE_SET_5G_MID2) |
196 | #define LOCALE_CHAN_100_140 \ | 196 | #define LOCALE_CHAN_100_140 \ |
197 | LOCALE_SET_5G_MID1 | LOCALE_SET_5G_MID2 | LOCALE_SET_5G_MID3 | LOCALE_SET_5G_HIGH1 | 197 | (LOCALE_SET_5G_MID1 | LOCALE_SET_5G_MID2 | LOCALE_SET_5G_MID3 | LOCALE_SET_5G_HIGH1) |
198 | #define LOCALE_CHAN_149_165 LOCALE_SET_5G_HIGH2 | LOCALE_SET_5G_HIGH3 | 198 | #define LOCALE_CHAN_149_165 (LOCALE_SET_5G_HIGH2 | LOCALE_SET_5G_HIGH3) |
199 | #define LOCALE_CHAN_184_216 LOCALE_SET_5G_HIGH4 | 199 | #define LOCALE_CHAN_184_216 LOCALE_SET_5G_HIGH4 |
200 | 200 | ||
201 | #define LOCALE_CHAN_01_14 (LOCALE_CHAN_01_11 | LOCALE_CHAN_12_13 | LOCALE_CHAN_14) | 201 | #define LOCALE_CHAN_01_14 (LOCALE_CHAN_01_11 | LOCALE_CHAN_12_13 | LOCALE_CHAN_14) |
diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.h b/drivers/staging/brcm80211/sys/wlc_mac80211.h index b437d9e6609..9759a9e9fe2 100644 --- a/drivers/staging/brcm80211/sys/wlc_mac80211.h +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.h | |||
@@ -177,13 +177,13 @@ extern const uint8 prio2fifo[]; | |||
177 | #define WLC_WME_RETRY_LFB_GET(wlc, ac) GFIELD(wlc->wme_retries[ac], EDCF_LFB) | 177 | #define WLC_WME_RETRY_LFB_GET(wlc, ac) GFIELD(wlc->wme_retries[ac], EDCF_LFB) |
178 | 178 | ||
179 | #define WLC_WME_RETRY_SHORT_SET(wlc, ac, val) \ | 179 | #define WLC_WME_RETRY_SHORT_SET(wlc, ac, val) \ |
180 | wlc->wme_retries[ac] = SFIELD(wlc->wme_retries[ac], EDCF_SHORT, val) | 180 | (wlc->wme_retries[ac] = SFIELD(wlc->wme_retries[ac], EDCF_SHORT, val)) |
181 | #define WLC_WME_RETRY_SFB_SET(wlc, ac, val) \ | 181 | #define WLC_WME_RETRY_SFB_SET(wlc, ac, val) \ |
182 | wlc->wme_retries[ac] = SFIELD(wlc->wme_retries[ac], EDCF_SFB, val) | 182 | (wlc->wme_retries[ac] = SFIELD(wlc->wme_retries[ac], EDCF_SFB, val)) |
183 | #define WLC_WME_RETRY_LONG_SET(wlc, ac, val) \ | 183 | #define WLC_WME_RETRY_LONG_SET(wlc, ac, val) \ |
184 | wlc->wme_retries[ac] = SFIELD(wlc->wme_retries[ac], EDCF_LONG, val) | 184 | (wlc->wme_retries[ac] = SFIELD(wlc->wme_retries[ac], EDCF_LONG, val)) |
185 | #define WLC_WME_RETRY_LFB_SET(wlc, ac, val) \ | 185 | #define WLC_WME_RETRY_LFB_SET(wlc, ac, val) \ |
186 | wlc->wme_retries[ac] = SFIELD(wlc->wme_retries[ac], EDCF_LFB, val) | 186 | (wlc->wme_retries[ac] = SFIELD(wlc->wme_retries[ac], EDCF_LFB, val)) |
187 | 187 | ||
188 | /* PLL requests */ | 188 | /* PLL requests */ |
189 | #define WLC_PLLREQ_SHARED 0x1 /* pll is shared on old chips */ | 189 | #define WLC_PLLREQ_SHARED 0x1 /* pll is shared on old chips */ |
diff --git a/drivers/staging/brcm80211/sys/wlc_scb.h b/drivers/staging/brcm80211/sys/wlc_scb.h index 5ec9e61a68e..9208bd51450 100644 --- a/drivers/staging/brcm80211/sys/wlc_scb.h +++ b/drivers/staging/brcm80211/sys/wlc_scb.h | |||
@@ -185,7 +185,7 @@ struct scb { | |||
185 | 185 | ||
186 | #define SCB_BSSCFG(a) ((a)->bsscfg) | 186 | #define SCB_BSSCFG(a) ((a)->bsscfg) |
187 | 187 | ||
188 | #define SCB_SEQNUM(scb, prio) (scb)->seqnum[(prio)] | 188 | #define SCB_SEQNUM(scb, prio) ((scb)->seqnum[(prio)]) |
189 | 189 | ||
190 | #define SCB_ISMULTI(a) ETHER_ISMULTI((a)->ea.octet) | 190 | #define SCB_ISMULTI(a) ETHER_ISMULTI((a)->ea.octet) |
191 | #define SCB_ISVALID(a, _pkttag_dbgid) ((a) && (a)->_dbgid == (_pkttag_dbgid)) | 191 | #define SCB_ISVALID(a, _pkttag_dbgid) ((a) && (a)->_dbgid == (_pkttag_dbgid)) |