staging: rtl8723au: update_sta_support_rate23a(): Use cfg80211_find_ie()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2014-04-15 19:44:01 +02:00 committed by Greg Kroah-Hartman
parent 82695d5ca3
commit bf35027425

View file

@ -1570,26 +1570,25 @@ void update_bmc_sta_support_rate23a(struct rtw_adapter *padapter, u32 mac_id)
} }
} }
int update_sta_support_rate23a(struct rtw_adapter *padapter, u8 *pvar_ie, uint var_ie_len, int cam_idx) int update_sta_support_rate23a(struct rtw_adapter *padapter, u8 *pvar_ie,
uint var_ie_len, int cam_idx)
{ {
unsigned int ie_len; int supportRateNum = 0;
struct ndis_802_11_var_ies *pIE;
int supportRateNum = 0;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
const u8 *p;
pIE = (struct ndis_802_11_var_ies *)rtw_get_ie23a(pvar_ie, p = cfg80211_find_ie(WLAN_EID_SUPP_RATES, pvar_ie, var_ie_len);
WLAN_EID_SUPP_RATES, if (!p)
&ie_len, var_ie_len);
if (pIE == NULL)
return _FAIL; return _FAIL;
memcpy(pmlmeinfo->FW_sta_info[cam_idx].SupportedRates, pIE->data, ie_len); memcpy(pmlmeinfo->FW_sta_info[cam_idx].SupportedRates, p + 2, p[1]);
supportRateNum = ie_len; supportRateNum = p[1];
pIE = (struct ndis_802_11_var_ies *)rtw_get_ie23a(pvar_ie, WLAN_EID_EXT_SUPP_RATES, &ie_len, var_ie_len); p = cfg80211_find_ie(WLAN_EID_EXT_SUPP_RATES, pvar_ie, var_ie_len);
if (pIE) if (p)
memcpy((pmlmeinfo->FW_sta_info[cam_idx].SupportedRates + supportRateNum), pIE->data, ie_len); memcpy(pmlmeinfo->FW_sta_info[cam_idx].SupportedRates +
supportRateNum, p + 2, p[1]);
return _SUCCESS; return _SUCCESS;
} }