Commit 6594c965 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman

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: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 65be27da
...@@ -2249,7 +2249,7 @@ unsigned int rtw_restructure_ht_ie23a(struct rtw_adapter *padapter, u8 *in_ie, ...@@ -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, p = cfg80211_find_ie(WLAN_EID_HT_OPERATION, in_ie + 12,
in_len -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; out_len = *pout_len;
pframe = rtw_set_ie23a(out_ie + out_len, pframe = rtw_set_ie23a(out_ie + out_len,
WLAN_EID_HT_OPERATION, WLAN_EID_HT_OPERATION,
...@@ -2266,7 +2266,7 @@ void rtw_update_ht_cap23a(struct rtw_adapter *padapter, u8 *pie, uint ie_len) ...@@ -2266,7 +2266,7 @@ void rtw_update_ht_cap23a(struct rtw_adapter *padapter, u8 *pie, uint ie_len)
u8 max_ampdu_sz; u8 max_ampdu_sz;
const u8 *p; const u8 *p;
struct ieee80211_ht_cap *pht_capie; 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 mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct ht_priv *phtpriv = &pmlmepriv->htpriv; struct ht_priv *phtpriv = &pmlmepriv->htpriv;
struct registry_priv *pregistrypriv = &padapter->registrypriv; struct registry_priv *pregistrypriv = &padapter->registrypriv;
...@@ -2314,7 +2314,7 @@ void rtw_update_ht_cap23a(struct rtw_adapter *padapter, u8 *pie, uint ie_len) ...@@ -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); p = cfg80211_find_ie(WLAN_EID_HT_OPERATION, pie, ie_len);
if (p && p[1] > 0) { if (p && p[1] > 0) {
pht_addtinfo = (struct ieee80211_ht_addt_info *)(p + 2); pht_addtinfo = (struct ieee80211_ht_operation *)(p + 2);
/* todo: */ /* todo: */
} }
......
...@@ -68,14 +68,6 @@ ...@@ -68,14 +68,6 @@
* This structure refers to "HT information element" as * This structure refers to "HT information element" as
* described in 802.11n draft section 7.3.2.53 * 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 { struct HT_info_element {
unsigned char primary_channel; unsigned char primary_channel;
unsigned char infos[5]; unsigned char infos[5];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment