Commit 6a5f657d authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman

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

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6f765c20
...@@ -1391,7 +1391,7 @@ static int rtw_ht_operation_update(struct rtw_adapter *padapter) ...@@ -1391,7 +1391,7 @@ static int rtw_ht_operation_update(struct rtw_adapter *padapter)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct ht_priv *phtpriv_ap = &pmlmepriv->htpriv; struct ht_priv *phtpriv_ap = &pmlmepriv->htpriv;
if (pmlmepriv->htpriv.ht_option == true) if (pmlmepriv->htpriv.ht_option)
return 0; return 0;
/* if (!iface->conf->ieee80211n || iface->conf->ht_op_mode_fixed) */ /* 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 ...@@ -1627,7 +1627,7 @@ void bss_cap_update_on_sta_join23a(struct rtw_adapter *padapter, struct sta_info
psta->no_ht_set = 1; psta->no_ht_set = 1;
pmlmepriv->num_sta_no_ht++; pmlmepriv->num_sta_no_ht++;
} }
if (pmlmepriv->htpriv.ht_option == true) { if (pmlmepriv->htpriv.ht_option) {
DBG_8723A("%s STA " MAC_FMT DBG_8723A("%s STA " MAC_FMT
" - no HT, num of non-HT stations %d\n", " - no HT, num of non-HT stations %d\n",
__func__, MAC_ARG(psta->hwaddr), __func__, MAC_ARG(psta->hwaddr),
...@@ -1865,7 +1865,7 @@ void sta_info_update23a(struct rtw_adapter *padapter, struct sta_info *psta) ...@@ -1865,7 +1865,7 @@ void sta_info_update23a(struct rtw_adapter *padapter, struct sta_info *psta)
psta->htpriv.ht_option = false; psta->htpriv.ht_option = false;
} }
if (pmlmepriv->htpriv.ht_option == false) if (!pmlmepriv->htpriv.ht_option)
psta->htpriv.ht_option = false; psta->htpriv.ht_option = false;
update_sta_info23a_apmode23a(padapter, psta); update_sta_info23a_apmode23a(padapter, psta);
......
...@@ -2409,7 +2409,7 @@ void rtw_issue_addbareq_cmd23a(struct rtw_adapter *padapter, ...@@ -2409,7 +2409,7 @@ void rtw_issue_addbareq_cmd23a(struct rtw_adapter *padapter,
phtpriv = &psta->htpriv; 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->agg_enable_bitmap>>priority)&0x1;
issued |= (phtpriv->candidate_tid_bitmap>>priority)&0x1; issued |= (phtpriv->candidate_tid_bitmap>>priority)&0x1;
......
...@@ -1666,7 +1666,7 @@ OnAssocReq23a(struct rtw_adapter *padapter, struct recv_frame *precv_frame) ...@@ -1666,7 +1666,7 @@ OnAssocReq23a(struct rtw_adapter *padapter, struct recv_frame *precv_frame)
} else } else
pstat->flags &= ~WLAN_STA_HT; 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; status = WLAN_STATUS_UNSPECIFIED_FAILURE;
goto OnAssocReq23aFail; goto OnAssocReq23aFail;
} }
...@@ -3479,7 +3479,7 @@ static void issue_assocreq(struct rtw_adapter *padapter) ...@@ -3479,7 +3479,7 @@ static void issue_assocreq(struct rtw_adapter *padapter)
&pattrib->pktlen); &pattrib->pktlen);
/* HT caps */ /* 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); p = cfg80211_find_ie(WLAN_EID_HT_CAPABILITY, pie, pie_len);
if (p && !is_ap_in_tkip23a(padapter)) { if (p && !is_ap_in_tkip23a(padapter)) {
...@@ -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 == true && phtpriv->ampdu_enable == true) { if (phtpriv->ht_option && phtpriv->ampdu_enable == true) {
if (phtpriv->candidate_tid_bitmap) if (phtpriv->candidate_tid_bitmap)
phtpriv->candidate_tid_bitmap = 0x0; phtpriv->candidate_tid_bitmap = 0x0;
} }
......
...@@ -727,7 +727,7 @@ void HT_caps_handler23a(struct rtw_adapter *padapter, const u8 *p) ...@@ -727,7 +727,7 @@ void HT_caps_handler23a(struct rtw_adapter *padapter, const u8 *p)
if (!p) if (!p)
return; return;
if (phtpriv->ht_option == false) if (!phtpriv->ht_option)
return; return;
pmlmeinfo->HT_caps_enable = 1; pmlmeinfo->HT_caps_enable = 1;
...@@ -784,7 +784,7 @@ void HT_info_handler23a(struct rtw_adapter *padapter, const u8 *p) ...@@ -784,7 +784,7 @@ void HT_info_handler23a(struct rtw_adapter *padapter, const u8 *p)
if (!p) if (!p)
return; return;
if (phtpriv->ht_option == false) if (!phtpriv->ht_option)
return; return;
if (p[1] != sizeof(struct ieee80211_ht_operation)) if (p[1] != sizeof(struct ieee80211_ht_operation))
......
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