staging: r8188eu: replace rtw_ieee80211_ht_cap with ieee80211_ht_cap type in translat...

rtw_ieee80211_ht_cap is reimplementation of the ieee80211_ht_cap.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
index 5672f014cc46dd5f4eaad94c67366e5514f8bd3e..a2b3552754ba036d8c1a437976bea006f593b38a 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
@@ -132,12 +132,15 @@ 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);
-               bw_40MHz = (pht_capie->cap_info&IEEE80211_HT_CAP_SUP_WIDTH) ? 1 : 0;
-               short_GI = (pht_capie->cap_info&(IEEE80211_HT_CAP_SGI_20|IEEE80211_HT_CAP_SGI_40)) ? 1 : 0;
+               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);
+               short_GI = !!(le16_to_cpu(pht_capie->cap_info) &
+                             (IEEE80211_HT_CAP_SGI_20 |
+                              IEEE80211_HT_CAP_SGI_40));
        }
 
        /* Add the protocol name */