staging: r8188eu: change rtw_ieee80211_ht_cap type of local variables to ieee80211_ht_cap

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/core/rtw_ieee80211.c b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
index 0c616bc..914c492 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
@@ -1042,7 +1042,6 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork)
        __le16 le_tmp;
        u16 wpa_len = 0, rsn_len = 0;
        struct HT_info_element *pht_info = NULL;
-       struct rtw_ieee80211_ht_cap *pht_cap = NULL;
        unsigned int            len;
        unsigned char           *p;
 
@@ -1078,10 +1077,12 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork)
        /* parsing HT_CAP_IE */
        p = rtw_get_ie(pnetwork->network.IEs + _FIXED_IE_LENGTH_, _HT_CAPABILITY_IE_, &len, pnetwork->network.IELength - _FIXED_IE_LENGTH_);
        if (p && len > 0) {
-                       pht_cap = (struct rtw_ieee80211_ht_cap *)(p + 2);
-                       pnetwork->BcnInfo.ht_cap_info = pht_cap->cap_info;
+               struct ieee80211_ht_cap *ht_cap =
+                       (struct ieee80211_ht_cap *)(p + 2);
+
+               pnetwork->BcnInfo.ht_cap_info = le16_to_cpu(ht_cap->cap_info);
        } else {
-                       pnetwork->BcnInfo.ht_cap_info = 0;
+               pnetwork->BcnInfo.ht_cap_info = 0;
        }
        /* parsing HT_INFO_IE */
        p = rtw_get_ie(pnetwork->network.IEs + _FIXED_IE_LENGTH_, _HT_ADD_INFO_IE_, &len, pnetwork->network.IELength - _FIXED_IE_LENGTH_);

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index a4e3bde..4979c61 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -1935,7 +1935,6 @@ 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;
-       struct rtw_ieee80211_ht_cap ht_capie;
        unsigned char WMM_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01, 0x00};
        struct mlme_priv        *pmlmepriv = &padapter->mlmepriv;
        struct qos_priv         *pqospriv = &pmlmepriv->qospriv;
@@ -1948,6 +1947,8 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
        p = rtw_get_ie(in_ie+12, _HT_CAPABILITY_IE_, &ielen, in_len-12);
 
        if (p && ielen > 0) {
+               struct ieee80211_ht_cap ht_cap;
+
                if (pqospriv->qos_option == 0) {
                        out_len = *pout_len;
                        rtw_set_ie(out_ie+out_len, _VENDOR_SPECIFIC_IE_,
@@ -1958,13 +1959,13 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
 
                out_len = *pout_len;
 
-               memset(&ht_capie, 0, sizeof(struct ieee80211_ht_cap));
+               memset(&ht_cap, 0, sizeof(struct ieee80211_ht_cap));
 
-               ht_capie.cap_info = IEEE80211_HT_CAP_SUP_WIDTH |
-                                   IEEE80211_HT_CAP_SGI_20 |
-                                   IEEE80211_HT_CAP_SGI_40 |
-                                   IEEE80211_HT_CAP_TX_STBC |
-                                   IEEE80211_HT_CAP_DSSSCCK40;
+               ht_cap.cap_info = cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH |
+                                             IEEE80211_HT_CAP_SGI_20 |
+                                             IEEE80211_HT_CAP_SGI_40 |
+                                             IEEE80211_HT_CAP_TX_STBC |
+                                             IEEE80211_HT_CAP_DSSSCCK40);
 
                rtw_hal_get_def_var(padapter, HAL_DEF_RX_PACKET_OFFSET, &rx_packet_offset);
                rtw_hal_get_def_var(padapter, HAL_DEF_MAX_RECVBUF_SZ, &max_recvbuf_sz);
@@ -1975,17 +1976,16 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
                */
 
                rtw_hal_get_def_var(padapter, HW_VAR_MAX_RX_AMPDU_FACTOR, &max_rx_ampdu_factor);
-               ht_capie.ampdu_params_info = (max_rx_ampdu_factor&0x03);
+               ht_cap.ampdu_params_info = max_rx_ampdu_factor & 0x03;
 
                if (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)
-                       ht_capie.ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY&(0x07<<2));
+                       ht_cap.ampdu_params_info |= IEEE80211_HT_CAP_AMPDU_DENSITY & (0x07 << 2);
                else
-                       ht_capie.ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY&0x00);
-
+                       ht_cap.ampdu_params_info |= IEEE80211_HT_CAP_AMPDU_DENSITY & 0x00;
 
                rtw_set_ie(out_ie+out_len, _HT_CAPABILITY_IE_,
                           sizeof(struct ieee80211_ht_cap),
-                          (unsigned char *)&ht_capie, pout_len);
+                          (unsigned char *)&ht_cap, pout_len);
 
                phtpriv->ht_option = true;
 
@@ -2003,7 +2003,6 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len)
 {
        u8 *p, max_ampdu_sz;
        int len;
-       struct rtw_ieee80211_ht_cap *pht_capie;
        struct mlme_priv        *pmlmepriv = &padapter->mlmepriv;
        struct ht_priv          *phtpriv = &pmlmepriv->htpriv;
        struct registry_priv *pregistrypriv = &padapter->registrypriv;
@@ -2033,8 +2032,10 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len)
        len = 0;
        p = rtw_get_ie(pie+sizeof(struct ndis_802_11_fixed_ie), _HT_CAPABILITY_IE_, &len, ie_len-sizeof(struct ndis_802_11_fixed_ie));
        if (p && len > 0) {
-               pht_capie = (struct rtw_ieee80211_ht_cap *)(p+2);
-               max_ampdu_sz = pht_capie->ampdu_params_info & IEEE80211_HT_CAP_AMPDU_FACTOR;
+               struct ieee80211_ht_cap *ht_cap =
+                       (struct ieee80211_ht_cap *)(p + 2);
+
+               max_ampdu_sz = ht_cap->ampdu_params_info & IEEE80211_HT_CAP_AMPDU_FACTOR;
                max_ampdu_sz = 1 << (max_ampdu_sz+3); /*  max_ampdu_sz (kbytes); */
                phtpriv->rx_ampdu_maxlen = max_ampdu_sz;
        }

diff --git a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
index 4410fe8..548db72 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
@@ -872,7 +872,6 @@ 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;
        u32 bcn_channel;
        unsigned short  ht_cap_info;
        unsigned char   ht_info_infos_0;
@@ -913,8 +912,10 @@ 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);
-               ht_cap_info = pht_cap->cap_info;
+               struct ieee80211_ht_cap *ht_cap =
+                       (struct ieee80211_ht_cap *)(p + 2);
+
+               ht_cap_info = le16_to_cpu(ht_cap->cap_info);
        } else {
                ht_cap_info = 0;
        }