Merge drm/drm-next into drm-intel-next-queued

[linux-2.6-microblaze.git] / drivers / staging / rtl8192u / ieee80211 / ieee80211_tx.c

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
index 0ee054d..63a561a 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
@@ -372,9 +372,9 @@ ieee80211_query_HTCapShortGI(struct ieee80211_device *ieee, struct cb_desc *tcb_
                return;
        }
 
-       if ((pHTInfo->bCurBW40MHz == true) && pHTInfo->bCurShortGI40MHz)
+       if (pHTInfo->bCurBW40MHz && pHTInfo->bCurShortGI40MHz)
                tcb_desc->bUseShortGI = true;
-       else if ((pHTInfo->bCurBW40MHz == false) && pHTInfo->bCurShortGI20MHz)
+       else if (!pHTInfo->bCurBW40MHz && pHTInfo->bCurShortGI20MHz)
                tcb_desc->bUseShortGI = true;
 }