staging: r8188eu: replace sizeof(struct rtw_ieee80211_ht_cap) with sizeof(struct...

Values of this expressions are equal, but ieee80211_ht_cap is library type.

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_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index 1456499..a4e3bde 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -1958,7 +1958,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 = IEEE80211_HT_CAP_SUP_WIDTH |
                                    IEEE80211_HT_CAP_SGI_20 |
@@ -1984,7 +1984,8 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
 
 
                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;
 

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index 40e0b60..91e7b36 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -3236,13 +3236,15 @@ static unsigned int OnAssocReq(struct adapter *padapter,
        }
 
        /* 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;
        }

diff --git a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
index a2b3552..44d3ed6 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
@@ -2531,7 +2531,8 @@ 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(&psta->htpriv.ht_cap, &param->u.add_sta.ht_cap,
+                              sizeof(struct ieee80211_ht_cap));
                } else {
                        psta->htpriv.ht_option = false;
                }
@@ -2627,7 +2628,8 @@ static int rtw_ioctl_get_sta_data(struct net_device *dev, struct ieee_param *par
                                      (psta->ht_20mhz_set << 5));
                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;