From 9600d4694172de0e075377fb17501279dafb3590 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 2 Oct 2012 11:26:04 +0300 Subject: [PATCH] --- yaml --- r: 337070 b: refs/heads/master c: cbf2f545d7adf9841d4b6ee7fbfa9b1706e369d4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8192u/ieee80211/ieee80211.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1f729b0082c1..a67ef3b810ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e5e624bfda39417cc76e716a350a318049dbd39 +refs/heads/master: cbf2f545d7adf9841d4b6ee7fbfa9b1706e369d4 diff --git a/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211.h index 13f45c3125ce..502bfdbcc84b 100644 --- a/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211.h +++ b/trunk/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