staging: rtl8723au: Be consistent in how htpriv.ht_option is checked

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_ap.c b/drivers/staging/rtl8723au/core/rtw_ap.c
index d67a5f1bfc448e61d0b4c7005cd24d796cbd3b75..a52662e8a2f651a098732d0195899763439c6047 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_ap.c
+++ b/drivers/staging/rtl8723au/core/rtw_ap.c
@@ -1391,7 +1391,7 @@ static int rtw_ht_operation_update(struct rtw_adapter *padapter)
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
        struct ht_priv *phtpriv_ap = &pmlmepriv->htpriv;
 
-       if (pmlmepriv->htpriv.ht_option == true)
+       if (pmlmepriv->htpriv.ht_option)
                return 0;
 
        /* if (!iface->conf->ieee80211n || iface->conf->ht_op_mode_fixed) */
@@ -1627,7 +1627,7 @@ void bss_cap_update_on_sta_join23a(struct rtw_adapter *padapter, struct sta_info
                        psta->no_ht_set = 1;
                        pmlmepriv->num_sta_no_ht++;
                }
-               if (pmlmepriv->htpriv.ht_option == true) {
+               if (pmlmepriv->htpriv.ht_option) {
                        DBG_8723A("%s STA " MAC_FMT
                                   " - no HT, num of non-HT stations %d\n",
                                   __func__, MAC_ARG(psta->hwaddr),
@@ -1865,7 +1865,7 @@ void sta_info_update23a(struct rtw_adapter *padapter, struct sta_info *psta)
                psta->htpriv.ht_option = false;
        }
 
-       if (pmlmepriv->htpriv.ht_option == false)
+       if (!pmlmepriv->htpriv.ht_option)
                psta->htpriv.ht_option = false;
 
        update_sta_info23a_apmode23a(padapter, psta);

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
index d48b986c06d85373bf57f145c0e111ee3c149c1c..31c414ab41094906cffdfb6c8d8671f45b82bfc2 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -2409,7 +2409,7 @@ void rtw_issue_addbareq_cmd23a(struct rtw_adapter *padapter,
 
        phtpriv = &psta->htpriv;
 
-       if (phtpriv->ht_option == true && phtpriv->ampdu_enable == true) {
+       if (phtpriv->ht_option && phtpriv->ampdu_enable == true) {
                issued = (phtpriv->agg_enable_bitmap>>priority)&0x1;
                issued |= (phtpriv->candidate_tid_bitmap>>priority)&0x1;
 

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
index e32df7545a0060573464f18d55facaf5ce4bfa46..ae8d38f7bfbb0c17e60a6b82c36ca04429e19269 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
@@ -1666,7 +1666,7 @@ OnAssocReq23a(struct rtw_adapter *padapter, struct recv_frame *precv_frame)
        } else
                pstat->flags &= ~WLAN_STA_HT;
 
-       if (pmlmepriv->htpriv.ht_option == false && pstat->flags & WLAN_STA_HT){
+       if (!pmlmepriv->htpriv.ht_option && pstat->flags & WLAN_STA_HT){
                status = WLAN_STATUS_UNSPECIFIED_FAILURE;
                goto OnAssocReq23aFail;
        }
@@ -3479,7 +3479,7 @@ static void issue_assocreq(struct rtw_adapter *padapter)
                                       &pattrib->pktlen);
 
        /* HT caps */
-       if (padapter->mlmepriv.htpriv.ht_option == true) {
+       if (padapter->mlmepriv.htpriv.ht_option) {
                p = cfg80211_find_ie(WLAN_EID_HT_CAPABILITY, pie, pie_len);
 
                if (p && !is_ap_in_tkip23a(padapter)) {
@@ -5848,7 +5848,7 @@ static void addba_timer_hdl(unsigned long data)
 
        phtpriv = &psta->htpriv;
 
-       if (phtpriv->ht_option == true && phtpriv->ampdu_enable == true) {
+       if (phtpriv->ht_option && phtpriv->ampdu_enable == true) {
                if (phtpriv->candidate_tid_bitmap)
                        phtpriv->candidate_tid_bitmap = 0x0;
        }

diff --git a/drivers/staging/rtl8723au/core/rtw_wlan_util.c b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
index b9ca08870d2f3f2f023e7b97a6dca0c511a3246b..3195b444e3bce606a55b010591dbd5996137582b 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
@@ -727,7 +727,7 @@ void HT_caps_handler23a(struct rtw_adapter *padapter, const u8 *p)
        if (!p)
                return;
 
-       if (phtpriv->ht_option == false)
+       if (!phtpriv->ht_option)
                return;
 
        pmlmeinfo->HT_caps_enable = 1;
@@ -784,7 +784,7 @@ void HT_info_handler23a(struct rtw_adapter *padapter, const u8 *p)
        if (!p)
                return;
 
-       if (phtpriv->ht_option == false)
+       if (!phtpriv->ht_option)
                return;
 
        if (p[1] != sizeof(struct ieee80211_ht_operation))