mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-02 16:55:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen
2014-06-09 15:16:07 +02:00
committed by Greg Kroah-Hartman
parent 6f765c20ca
commit 6a5f657db5
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/rtl8723au/core/rtw_ap.c
View File

@@ -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);

2
drivers/staging/rtl8723au/core/rtw_mlme.c
View File

@@ -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;

6
drivers/staging/rtl8723au/core/rtw_mlme_ext.c
View File

@@ -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;
}

4
drivers/staging/rtl8723au/core/rtw_wlan_util.c
View File

@@ -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))