Commit 47e5d2f2 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman

staging: rtl8723au: Make struct htpriv.ampdu_enable a bool

Be consistent in parsing it's value
Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6a5f657d
...@@ -2291,8 +2291,7 @@ void rtw_update_ht_cap23a(struct rtw_adapter *padapter, u8 *pie, uint ie_len) ...@@ -2291,8 +2291,7 @@ void rtw_update_ht_cap23a(struct rtw_adapter *padapter, u8 *pie, uint ie_len)
ie_len -= bcn_fixed_size; ie_len -= bcn_fixed_size;
/* maybe needs check if ap supports rx ampdu. */ /* maybe needs check if ap supports rx ampdu. */
if (phtpriv->ampdu_enable == false && if (!phtpriv->ampdu_enable && pregistrypriv->ampdu_enable == 1) {
pregistrypriv->ampdu_enable == 1) {
if (pregistrypriv->wifi_spec == 1) if (pregistrypriv->wifi_spec == 1)
phtpriv->ampdu_enable = false; phtpriv->ampdu_enable = false;
else else
...@@ -2409,7 +2408,7 @@ void rtw_issue_addbareq_cmd23a(struct rtw_adapter *padapter, ...@@ -2409,7 +2408,7 @@ void rtw_issue_addbareq_cmd23a(struct rtw_adapter *padapter,
phtpriv = &psta->htpriv; 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->agg_enable_bitmap>>priority)&0x1;
issued |= (phtpriv->candidate_tid_bitmap>>priority)&0x1; issued |= (phtpriv->candidate_tid_bitmap>>priority)&0x1;
......
...@@ -5848,7 +5848,7 @@ static void addba_timer_hdl(unsigned long data) ...@@ -5848,7 +5848,7 @@ static void addba_timer_hdl(unsigned long data)
phtpriv = &psta->htpriv; phtpriv = &psta->htpriv;
if (phtpriv->ht_option && phtpriv->ampdu_enable == true) { if (phtpriv->ht_option && phtpriv->ampdu_enable) {
if (phtpriv->candidate_tid_bitmap) if (phtpriv->candidate_tid_bitmap)
phtpriv->candidate_tid_bitmap = 0x0; phtpriv->candidate_tid_bitmap = 0x0;
} }
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
struct ht_priv struct ht_priv
{ {
bool ht_option; bool ht_option;
u32 ampdu_enable;/* for enable Tx A-MPDU */ bool ampdu_enable;/* for enable Tx A-MPDU */
/* u8 baddbareq_issued[16]; */ /* u8 baddbareq_issued[16]; */
u32 tx_amsdu_enable;/* for enable Tx A-MSDU */ u32 tx_amsdu_enable;/* for enable Tx A-MSDU */
u32 tx_amdsu_maxlen; /* 1: 8k, 0:4k ; default:8k, for tx */ u32 tx_amdsu_maxlen; /* 1: 8k, 0:4k ; default:8k, for tx */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment