65 lines
2.6 KiB
Diff
65 lines
2.6 KiB
Diff
From: Jes Sorensen <Jes.Sorensen@redhat.com>
|
|
Date: Mon, 9 Jun 2014 15:16:08 +0200
|
|
Subject: [031/249] staging: rtl8723au: Make struct htpriv.ampdu_enable a bool
|
|
Origin: https://git.kernel.org/linus/47e5d2f26d86d8bf1b5ecff2994f939e4283ffeb
|
|
|
|
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>
|
|
---
|
|
drivers/staging/rtl8723au/core/rtw_mlme.c | 5 ++---
|
|
drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 2 +-
|
|
drivers/staging/rtl8723au/include/rtw_ht.h | 2 +-
|
|
3 files changed, 4 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
|
|
index 31c414a..4a33e7d 100644
|
|
--- 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 ae8d38f..9b8566c 100644
|
|
--- 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 f086376..cfc947d 100644
|
|
--- 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 */
|