Remove more duplicated ieee80211 definitions

[android-x86/external-modules-rtl8723au.git] / os_dep / ioctl_linux.c

diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c
index 3a8e34c..0ea317f 100644 (file)
--- a/os_dep/ioctl_linux.c
+++ b/os_dep/ioctl_linux.c
@@ -416,11 +416,11 @@ static char *translate_scan(_adapter *padapter,
 
        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);
-               bw_40MHz = (pht_capie->cap_info&IEEE80211_HT_CAP_SUP_WIDTH) ? 1:0;
+               pht_capie = (struct ieee80211_ht_cap *)(p+2);
+               memcpy(&mcs_rate , &pht_capie->mcs, 2);
+               bw_40MHz = (pht_capie->cap_info & IEEE80211_HT_CAP_SUP_WIDTH_20_40) ? 1:0;
                short_GI = (pht_capie->cap_info&(IEEE80211_HT_CAP_SGI_20|IEEE80211_HT_CAP_SGI_40)) ? 1:0;
        }
 
@@ -7620,7 +7620,7 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param)
                {
                        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
                {
@@ -7737,7 +7737,7 @@ static int rtw_ioctl_get_sta_data(struct net_device *dev, struct ieee_param *par
                        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;
@@ -7769,7 +7769,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);
 #ifdef CONFIG_80211N_HT
-               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));
 #endif //CONFIG_80211N_HT
                psta_data->rx_pkts = psta->sta_stats.rx_data_pkts;
                psta_data->rx_bytes = psta->sta_stats.rx_bytes;