diff options
| author | Dan Carpenter | 2012-10-02 10:26:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-10-22 20:39:22 +0200 |
| commit | cbf2f545d7adf9841d4b6ee7fbfa9b1706e369d4 (patch) | |
| tree | 05a0f054270de862a43d5807a26aa278ed0cc228 /drivers/staging/rtl8192u/ieee80211/ieee80211.h | |
| parent | staging/olpc_dcon: use s/r hooks from device_driver->pm (diff) | |
| download | kernel-qcow2-linux-cbf2f545d7adf9841d4b6ee7fbfa9b1706e369d4.tar.gz kernel-qcow2-linux-cbf2f545d7adf9841d4b6ee7fbfa9b1706e369d4.tar.xz kernel-qcow2-linux-cbf2f545d7adf9841d4b6ee7fbfa9b1706e369d4.zip | |
staging: rtl8192u: fix a macro expansion bug
Clang detected this macro expansion bug:
drivers/staging/rtl8192u/r8192U_core.c:2384:76: warning: operator '?:'
has lower precedence than '+'; '+' will be evaluated first
[-Wparentheses]
The line from the .c file looks like this:
u1bAIFS = qos_parameters->aifs[i] * ((mode&(IEEE_G|IEEE_N_24G)) ?9:20) + aSifsTime;
We need to put parenthesis around the entire macro to fix the bug.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8192u/ieee80211/ieee80211.h')
| -rw-r--r-- | drivers/staging/rtl8192u/ieee80211/ieee80211.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h index 13f45c3125ce..502bfdbcc84b 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h @@ -235,7 +235,10 @@ enum _ReasonCode{ -#define aSifsTime ((priv->ieee80211->current_network.mode == IEEE_A)||(priv->ieee80211->current_network.mode == IEEE_N_24G)||(priv->ieee80211->current_network.mode == IEEE_N_5G))? 16 : 10 +#define aSifsTime ((priv->ieee80211->current_network.mode == IEEE_A || \ + priv->ieee80211->current_network.mode == IEEE_N_24G || \ + priv->ieee80211->current_network.mode == IEEE_N_5G) ? \ + 16 : 10) #define MGMT_QUEUE_NUM 5 |