staging: rtl8723au: Make struct htpriv.ampdu_enable a bool

Be consistent in parsing it's value

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_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
index 31c414ab41094906cffdfb6c8d8671f45b82bfc2..4a33e7d5d412a46c3f2cabd522eb755319fbac1c 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -2291,8 +2291,7 @@ void rtw_update_ht_cap23a(struct rtw_adapter *padapter, u8 *pie, uint ie_len)
        ie_len -= bcn_fixed_size;
 
        /* maybe needs check if ap supports rx ampdu. */
-       if (phtpriv->ampdu_enable == false &&
-           pregistrypriv->ampdu_enable == 1) {
+       if (!phtpriv->ampdu_enable && pregistrypriv->ampdu_enable == 1) {
                if (pregistrypriv->wifi_spec == 1)
                        phtpriv->ampdu_enable = false;
                else
@@ -2409,7 +2408,7 @@ void rtw_issue_addbareq_cmd23a(struct rtw_adapter *padapter,
 
        phtpriv = &psta->htpriv;
 
-       if (phtpriv->ht_option && phtpriv->ampdu_enable == true) {
+       if (phtpriv->ht_option && phtpriv->ampdu_enable) {
                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 ae8d38f7bfbb0c17e60a6b82c36ca04429e19269..9b8566c25f7c9c90578cfa3eac53ddb079682fda 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
@@ -5848,7 +5848,7 @@ static void addba_timer_hdl(unsigned long data)
 
        phtpriv = &psta->htpriv;
 
-       if (phtpriv->ht_option && phtpriv->ampdu_enable == true) {
+       if (phtpriv->ht_option && phtpriv->ampdu_enable) {
                if (phtpriv->candidate_tid_bitmap)
                        phtpriv->candidate_tid_bitmap = 0x0;
        }

diff --git a/drivers/staging/rtl8723au/include/rtw_ht.h b/drivers/staging/rtl8723au/include/rtw_ht.h
index f0863765f74e69d40e6ff7b33a20cee6e43dadab..cfc947daf08be72b782018ce73f60a26084e34c4 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtw_ht.h
+++ b/drivers/staging/rtl8723au/include/rtw_ht.h
@@ -22,7 +22,7 @@
 struct ht_priv
 {
        bool    ht_option;
-       u32     ampdu_enable;/* for enable Tx A-MPDU */
+       bool    ampdu_enable;/* for enable Tx A-MPDU */
        /* u8   baddbareq_issued[16]; */
        u32     tx_amsdu_enable;/* for enable Tx A-MSDU */
        u32     tx_amdsu_maxlen; /*  1: 8k, 0:4k ; default:8k, for tx */