staging: rtl8723bs: replace rtw_ieee80211_ht_cap

Replace the unique rtw_ieee80211_ht_cap struct with the provided standard
ieee80211_ht_cap.

Signed-off-by: Ross Schmidt <ross.schm.dev@gmail.com>
Link: https://lore.kernel.org/r/20201105034754.12383-6-ross.schm.dev@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c
index d9a55bee83a32b2c9a1dbe31f7d7519c89699c87..a2b39ae56d892aede2e020007ad907479f310d83 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
@@ -1179,7 +1179,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len)
        if (p && ie_len > 0) {
                u8 rf_type = 0;
                u8 max_rx_ampdu_factor = 0;
-               struct rtw_ieee80211_ht_cap *pht_cap = (struct rtw_ieee80211_ht_cap *)(p + 2);
+               struct ieee80211_ht_cap *pht_cap = (struct ieee80211_ht_cap *)(p + 2);
 
                pHT_caps_ie = p;
 
@@ -1225,8 +1225,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len)
 
                rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type));
                if (rf_type == RF_1T1R) {
-                       pht_cap->supp_mcs_set[0] = 0xff;
-                       pht_cap->supp_mcs_set[1] = 0x0;
+                       pht_cap->mcs.rx_mask[0] = 0xff;
+                       pht_cap->mcs.rx_mask[1] = 0x0;
                }
 
                memcpy(&pmlmepriv->htpriv.ht_cap, p + 2, ie_len);

diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
index d44b33e7a0a9e38dfbcdf73901f03a9c3e7abd82..e0bab0a71f001cd47b865ad33720aeac0dce0296 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
@@ -661,7 +661,7 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter)
                        rf_type,
                        ((psta->bw_mode == CHANNEL_WIDTH_40)?1:0),
                        short_GI,
-                       psta->htpriv.ht_cap.supp_mcs_set
+                       psta->htpriv.ht_cap.mcs.rx_mask
                );
        } else {
                while ((pcur_bss->SupportedRates[i] != 0) && (pcur_bss->SupportedRates[i] != 0xFF)) {

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index b5226a517b911b92fb29162f022778df44b7c77c..351178ab78c5f8f537e5463b77eb67331c25ab0d 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -2582,7 +2582,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
        u32 ielen, out_len;
        enum HT_CAP_AMPDU_FACTOR max_rx_ampdu_factor;
        unsigned char *p, *pframe;
-       struct rtw_ieee80211_ht_cap ht_capie;
+       struct ieee80211_ht_cap ht_capie;
        u8 cbw40_enable = 0, stbc_rx_enable = 0, rf_type = 0, operation_bw = 0;
        struct registry_priv *pregistrypriv = &padapter->registrypriv;
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -2593,7 +2593,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
 
        out_len = *pout_len;
 
-       memset(&ht_capie, 0, sizeof(struct rtw_ieee80211_ht_cap));
+       memset(&ht_capie, 0, sizeof(struct ieee80211_ht_cap));
 
        ht_capie.cap_info = cpu_to_le16(IEEE80211_HT_CAP_DSSSCCK40);
 
@@ -2660,7 +2660,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
        }
 
        /* fill default supported_mcs_set */
-       memcpy(ht_capie.supp_mcs_set, pmlmeext->default_supported_mcs_set, 16);
+       memcpy(ht_capie.mcs.rx_mask, pmlmeext->default_supported_mcs_set, 16);
 
        /* update default supported_mcs_set */
        rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type));
@@ -2670,7 +2670,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
                if (stbc_rx_enable)
                        ht_capie.cap_info |= cpu_to_le16(IEEE80211_HT_CAP_RX_STBC_1R);/* RX STBC One spatial stream */
 
-               set_mcs_rate_by_mask(ht_capie.supp_mcs_set, MCS_RATE_1R);
+               set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_1R);
                break;
 
        case RF_2T2R:
@@ -2681,11 +2681,11 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
 
                #ifdef CONFIG_DISABLE_MCS13TO15
                if (((cbw40_enable == 1) && (operation_bw == CHANNEL_WIDTH_40)) && (pregistrypriv->wifi_spec != 1))
-                               set_mcs_rate_by_mask(ht_capie.supp_mcs_set, MCS_RATE_2R_13TO15_OFF);
+                               set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_2R_13TO15_OFF);
                else
-                               set_mcs_rate_by_mask(ht_capie.supp_mcs_set, MCS_RATE_2R);
+                               set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_2R);
                #else /* CONFIG_DISABLE_MCS13TO15 */
-                       set_mcs_rate_by_mask(ht_capie.supp_mcs_set, MCS_RATE_2R);
+                       set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_2R);
                #endif /* CONFIG_DISABLE_MCS13TO15 */
                break;
        }
@@ -2712,7 +2712,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
                ht_capie.ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY&0x00);
 
        pframe = rtw_set_ie(out_ie+out_len, _HT_CAPABILITY_IE_,
-                                               sizeof(struct rtw_ieee80211_ht_cap), (unsigned char *)&ht_capie, pout_len);
+                                               sizeof(struct ieee80211_ht_cap), (unsigned char *)&ht_capie, pout_len);
 
        phtpriv->ht_option = true;
 
@@ -2734,7 +2734,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe
        u8 *p, max_ampdu_sz;
        int len;
        /* struct sta_info *bmc_sta, *psta; */
-       struct rtw_ieee80211_ht_cap *pht_capie;
+       struct ieee80211_ht_cap *pht_capie;
        struct ieee80211_ht_addt_info *pht_addtinfo;
        /* struct recv_reorder_ctrl *preorder_ctrl; */
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -2763,7 +2763,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe
        len = 0;
        p = rtw_get_ie(pie+sizeof(struct ndis_802_11_fix_ie), _HT_CAPABILITY_IE_, &len, ie_len-sizeof(struct ndis_802_11_fix_ie));
        if (p && len > 0) {
-               pht_capie = (struct rtw_ieee80211_ht_cap *)(p+2);
+               pht_capie = (struct ieee80211_ht_cap *)(p+2);
                max_ampdu_sz = (pht_capie->ampdu_params_info & IEEE80211_HT_CAP_AMPDU_FACTOR);
                max_ampdu_sz = 1 << (max_ampdu_sz+3); /*  max_ampdu_sz (kbytes); */
 

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index a0bb25031f1aa44c1118b3c898e976329332282a..3bb80db51562f8991c4540d020624bb3fb0f2449 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -1494,13 +1494,13 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
        }
 
        /* save HT capabilities in the sta object */
-       memset(&pstat->htpriv.ht_cap, 0, sizeof(struct rtw_ieee80211_ht_cap));
-       if (elems.ht_capabilities && elems.ht_capabilities_len >= sizeof(struct rtw_ieee80211_ht_cap)) {
+       memset(&pstat->htpriv.ht_cap, 0, sizeof(struct ieee80211_ht_cap));
+       if (elems.ht_capabilities && elems.ht_capabilities_len >= sizeof(struct ieee80211_ht_cap)) {
                pstat->flags |= WLAN_STA_HT;
 
                pstat->flags |= WLAN_STA_WME;
 
-               memcpy(&pstat->htpriv.ht_cap, elems.ht_capabilities, sizeof(struct rtw_ieee80211_ht_cap));
+               memcpy(&pstat->htpriv.ht_cap, elems.ht_capabilities, sizeof(struct ieee80211_ht_cap));
 
        } else
                pstat->flags &= ~WLAN_STA_HT;
@@ -5348,7 +5348,7 @@ void update_sta_info(struct adapter *padapter, struct sta_info *psta)
                psta->htpriv.stbc_cap = pmlmepriv->htpriv.stbc_cap;
                psta->htpriv.beamform_cap = pmlmepriv->htpriv.beamform_cap;
 
-               memcpy(&psta->htpriv.ht_cap, &pmlmeinfo->HT_caps, sizeof(struct rtw_ieee80211_ht_cap));
+               memcpy(&psta->htpriv.ht_cap, &pmlmeinfo->HT_caps, sizeof(struct ieee80211_ht_cap));
        } else {
                psta->htpriv.ht_option = false;
 

diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index eda91b78a543f578b53400e084f5c9b4e0a80b4d..c9ac5c685d7470691a5c56431fe74c9603b220dc 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -1233,7 +1233,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
        u32 wpa_ielen = 0;
        u8 *pbssid = GetAddr3Ptr(pframe);
        struct HT_info_element *pht_info = NULL;
-       struct rtw_ieee80211_ht_cap *pht_cap = NULL;
+       struct ieee80211_ht_cap *pht_cap = NULL;
        u32 bcn_channel;
        unsigned short  ht_cap_info;
        unsigned char ht_info_infos_0;
@@ -1282,7 +1282,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
        /* parsing HT_CAP_IE */
        p = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _HT_CAPABILITY_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_);
        if (p && len > 0) {
-                       pht_cap = (struct rtw_ieee80211_ht_cap *)(p + 2);
+                       pht_cap = (struct ieee80211_ht_cap *)(p + 2);
                        ht_cap_info = le16_to_cpu(pht_cap->cap_info);
        } else {
                        ht_cap_info = 0;

diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c
index 02676da5c166a5b74ce9911bdefccefe042ede53..16b259acbe1aab8647cb114b2334eefb945ce51b 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_com.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com.c
@@ -989,7 +989,7 @@ void rtw_hal_update_sta_rate_mask(struct adapter *padapter, struct sta_info *pst
                        limit = 8; /*   1R */
 
                for (i = 0; i < limit; i++) {
-                       if (psta->htpriv.ht_cap.supp_mcs_set[i/8] & BIT(i%8))
+                       if (psta->htpriv.ht_cap.mcs.rx_mask[i/8] & BIT(i%8))
                                tx_ra_bitmap |= BIT(i+12);
                }
        }

diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h
index 5cd307cb48a5a231fb9a657986d0b22bfbe81e79..e2a6b92ba3ba4c049522982883dde9948096d820 100644 (file)
--- a/drivers/staging/rtl8723bs/include/ieee80211.h
+++ b/drivers/staging/rtl8723bs/include/ieee80211.h
@@ -232,7 +232,7 @@ struct ieee_param {
                        u16 capability;
                        int flags;
                        u8 tx_supp_rates[16];
-                       struct rtw_ieee80211_ht_cap ht_cap;
+                       struct ieee80211_ht_cap ht_cap;
                } add_sta;
                struct {
                        u8 reserved[2];/* for set max_num_sta */
@@ -254,7 +254,7 @@ struct sta_data {
        u32 sta_set;
        u8 tx_supp_rates[16];
        u32 tx_supp_rates_len;
-       struct rtw_ieee80211_ht_cap ht_cap;
+       struct ieee80211_ht_cap ht_cap;
        u64     rx_pkts;
        u64     rx_bytes;
        u64     rx_drops;

diff --git a/drivers/staging/rtl8723bs/include/rtw_ht.h b/drivers/staging/rtl8723bs/include/rtw_ht.h
index 13489913f40b3c6fd2d57904b74a0462d02dff8c..a72f51031f89ee2a83fdc1672ca1c57eed0e4faf 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_ht.h
+++ b/drivers/staging/rtl8723bs/include/rtw_ht.h
@@ -33,7 +33,7 @@ struct ht_priv {
        u8 stbc_cap;
        u8 beamform_cap;
 
-       struct rtw_ieee80211_ht_cap ht_cap;
+       struct ieee80211_ht_cap ht_cap;
 
 };
 

diff --git a/drivers/staging/rtl8723bs/include/wifi.h b/drivers/staging/rtl8723bs/include/wifi.h
index 3a7dd2ed26a822774ac63ea94cfda5ad1d400ef3..6f2d4ea51f1509eaa24094d468c9fca8d7ca6d3c 100644 (file)
--- a/drivers/staging/rtl8723bs/include/wifi.h
+++ b/drivers/staging/rtl8723bs/include/wifi.h
@@ -657,22 +657,6 @@ struct rtw_ieee80211_bar {
        __le16 start_seq_num;
 } __attribute__((packed));
 
- /**
- * struct rtw_ieee80211_ht_cap - HT capabilities
- *
- * This structure refers to "HT capabilities element" as
- * described in 802.11n draft section 7.3.2.52
- */
-
-struct rtw_ieee80211_ht_cap {
-       __le16  cap_info;
-       unsigned char ampdu_params_info;
-       unsigned char supp_mcs_set[16];
-       __le16  extended_ht_cap_info;
-       __le16          tx_BF_cap_info;
-       unsigned char        antenna_selection_info;
-} __attribute__ ((packed));
-
 /**
  * struct rtw_ieee80211_ht_cap - HT additional information
  *

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index 3f3eab3d879a7d9e47f367b7338119fd9ecef3d0..783daa30f1d7f19050a6572d1ab5c975a792afee 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -114,10 +114,10 @@ static char *translate_scan(struct adapter *padapter,
                p = rtw_get_ie(&pnetwork->network.IEs[12], _HT_CAPABILITY_IE_, &ht_ielen, pnetwork->network.IELength-12);
        }
        if (p && ht_ielen > 0) {
-               struct rtw_ieee80211_ht_cap *pht_capie;
+               struct ieee80211_ht_cap *pht_capie;
                ht_cap = true;
-               pht_capie = (struct rtw_ieee80211_ht_cap *)(p+2);
-               memcpy(&mcs_rate, pht_capie->supp_mcs_set, 2);
+               pht_capie = (struct ieee80211_ht_cap *)(p+2);
+               memcpy(&mcs_rate, pht_capie->mcs.rx_mask, 2);
                bw_40MHz = (le16_to_cpu(pht_capie->cap_info) & IEEE80211_HT_CAP_SUP_WIDTH) ? 1 : 0;
                short_GI = (le16_to_cpu(pht_capie->cap_info) & (IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_40)) ? 1 : 0;
        }
@@ -3793,7 +3793,7 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param)
                if (WLAN_STA_HT&flags) {
                        psta->htpriv.ht_option = true;
                        psta->qos_option = 1;
-                       memcpy((void *)&psta->htpriv.ht_cap, (void *)&param->u.add_sta.ht_cap, sizeof(struct rtw_ieee80211_ht_cap));
+                       memcpy((void *)&psta->htpriv.ht_cap, (void *)&param->u.add_sta.ht_cap, sizeof(struct ieee80211_ht_cap));
                } else {
                        psta->htpriv.ht_option = false;
                }
@@ -3906,7 +3906,7 @@ static int rtw_ioctl_get_sta_data(struct net_device *dev, struct ieee_param *par
 
                psta_data->tx_supp_rates_len =  psta->bssratelen;
                memcpy(psta_data->tx_supp_rates, psta->bssrateset, psta->bssratelen);
-               memcpy(&psta_data->ht_cap, &psta->htpriv.ht_cap, sizeof(struct rtw_ieee80211_ht_cap));
+               memcpy(&psta_data->ht_cap, &psta->htpriv.ht_cap, sizeof(struct ieee80211_ht_cap));
                psta_data->rx_pkts = psta->sta_stats.rx_data_pkts;
                psta_data->rx_bytes = psta->sta_stats.rx_bytes;
                psta_data->rx_drops = psta->sta_stats.rx_drops;