From: Dan Carpenter Date: Tue, 2 Oct 2012 08:26:04 +0000 (+0300) Subject: staging: rtl8192u: fix a macro expansion bug X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cbf2f545d7adf9841d4b6ee7fbfa9b1706e369d4;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h index 13f45c3125c..502bfdbcc84 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