staging: rtl8723au: Use struct ieee80211_ht_cap and associated #defines

[mirror_ubuntu-artful-kernel.git] / drivers / staging / rtl8723au / core / rtw_mlme.c

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
index ab59ab72d0413b7cc3c9019373fc7b9b20b883ec..19b891f9b55bf98dfabf817d6482e34a0ce8fc05 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -2320,7 +2320,8 @@ void rtw_update_ht_cap23a(struct rtw_adapter *padapter, u8 *pie, uint ie_len)
 
        /* update cur_bwmode & cur_ch_offset */
        if (pregistrypriv->cbw40_enable &&
-           pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info & BIT(1) &&
+           pmlmeinfo->ht_cap.cap_info &
+           cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH_20_40) &&
            pmlmeinfo->HT_info.infos[0] & BIT(2)) {
                int i;
                u8 rf_type;
@@ -2330,9 +2331,11 @@ void rtw_update_ht_cap23a(struct rtw_adapter *padapter, u8 *pie, uint ie_len)
                /* update the MCS rates */
                for (i = 0; i < IEEE80211_HT_MCS_MASK_LEN; i++) {
                        if (rf_type == RF_1T1R || rf_type == RF_1T2R)
-                               pmlmeinfo->HT_caps.u.HT_cap_element.mcs_info.rx_mask[i] &= MCS_rate_1R23A[i];
+                               pmlmeinfo->ht_cap.mcs.rx_mask[i] &=
+                                       MCS_rate_1R23A[i];
                        else
-                               pmlmeinfo->HT_caps.u.HT_cap_element.mcs_info.rx_mask[i] &= MCS_rate_2R23A[i];
+                               pmlmeinfo->ht_cap.mcs.rx_mask[i] &=
+                                       MCS_rate_2R23A[i];
                }
                /* switch to the 40M Hz mode accoring to the AP */
                pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_40;
@@ -2356,8 +2359,9 @@ void rtw_update_ht_cap23a(struct rtw_adapter *padapter, u8 *pie, uint ie_len)
        /*  */
        /*  Config SM Power Save setting */
        /*  */
-       pmlmeinfo->SM_PS = (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info &
-                           0x0C) >> 2;
+       pmlmeinfo->SM_PS =
+               (le16_to_cpu(pmlmeinfo->ht_cap.cap_info) &
+                IEEE80211_HT_CAP_SM_PS) >> IEEE80211_HT_CAP_SM_PS_SHIFT;
        if (pmlmeinfo->SM_PS == WLAN_HT_CAP_SM_PS_STATIC)
                DBG_8723A("%s(): WLAN_HT_CAP_SM_PS_STATIC\n", __func__);