From 6594c965ca8c07ba2c152bfa3c23700650d2969b Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Sat, 31 May 2014 18:05:12 +0200 Subject: [PATCH] staging: rtl8723au: Use correct struct for WLAN_EID_HT_CAPABILITY WLAN_EID_HT_CAPABILITY carries a struct ieee80211_ht_operation - use the right struct instead of a self invented one. Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723au/core/rtw_mlme.c | 6 +++--- drivers/staging/rtl8723au/include/wifi.h | 8 -------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c index 19b891f9b55b..297e2e47ea54 100644 --- a/drivers/staging/rtl8723au/core/rtw_mlme.c +++ b/drivers/staging/rtl8723au/core/rtw_mlme.c @@ -2249,7 +2249,7 @@ unsigned int rtw_restructure_ht_ie23a(struct rtw_adapter *padapter, u8 *in_ie, p = cfg80211_find_ie(WLAN_EID_HT_OPERATION, in_ie + 12, in_len -12); - if (p && (p[1] == sizeof(struct ieee80211_ht_addt_info))) { + if (p && (p[1] == sizeof(struct ieee80211_ht_operation))) { out_len = *pout_len; pframe = rtw_set_ie23a(out_ie + out_len, WLAN_EID_HT_OPERATION, @@ -2266,7 +2266,7 @@ void rtw_update_ht_cap23a(struct rtw_adapter *padapter, u8 *pie, uint ie_len) u8 max_ampdu_sz; const u8 *p; struct ieee80211_ht_cap *pht_capie; - struct ieee80211_ht_addt_info *pht_addtinfo; + struct ieee80211_ht_operation *pht_addtinfo; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct ht_priv *phtpriv = &pmlmepriv->htpriv; struct registry_priv *pregistrypriv = &padapter->registrypriv; @@ -2314,7 +2314,7 @@ void rtw_update_ht_cap23a(struct rtw_adapter *padapter, u8 *pie, uint ie_len) p = cfg80211_find_ie(WLAN_EID_HT_OPERATION, pie, ie_len); if (p && p[1] > 0) { - pht_addtinfo = (struct ieee80211_ht_addt_info *)(p + 2); + pht_addtinfo = (struct ieee80211_ht_operation *)(p + 2); /* todo: */ } diff --git a/drivers/staging/rtl8723au/include/wifi.h b/drivers/staging/rtl8723au/include/wifi.h index d0a8c8638b0d..6d221dfc48c5 100644 --- a/drivers/staging/rtl8723au/include/wifi.h +++ b/drivers/staging/rtl8723au/include/wifi.h @@ -68,14 +68,6 @@ * This structure refers to "HT information element" as * described in 802.11n draft section 7.3.2.53 */ -struct ieee80211_ht_addt_info { - unsigned char control_chan; - unsigned char ht_param; - unsigned short operation_mode; - unsigned short stbc_param; - unsigned char basic_set[16]; -} __packed; - struct HT_info_element { unsigned char primary_channel; unsigned char infos[5]; -- 2.30.2