Commit 731f9da7 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman

staging: rtl8723au: start_bss_network(): Use cfg80211_find_ie()

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bf350274
...@@ -646,11 +646,10 @@ static void update_hw_ht_param(struct rtw_adapter *padapter) ...@@ -646,11 +646,10 @@ static void update_hw_ht_param(struct rtw_adapter *padapter)
static void start_bss_network(struct rtw_adapter *padapter, u8 *pbuf) static void start_bss_network(struct rtw_adapter *padapter, u8 *pbuf)
{ {
u8 *p; const u8 *p;
u8 val8, cur_channel, cur_bwmode, cur_ch_offset; u8 val8, cur_channel, cur_bwmode, cur_ch_offset;
u16 bcn_interval; u16 bcn_interval;
u32 acparm; u32 acparm;
int ie_len;
struct registry_priv *pregpriv = &padapter->registrypriv; struct registry_priv *pregpriv = &padapter->registrypriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct security_priv* psecuritypriv = &padapter->securitypriv; struct security_priv* psecuritypriv = &padapter->securitypriv;
...@@ -727,18 +726,21 @@ static void start_bss_network(struct rtw_adapter *padapter, u8 *pbuf) ...@@ -727,18 +726,21 @@ static void start_bss_network(struct rtw_adapter *padapter, u8 *pbuf)
DYNAMIC_ALL_FUNC_ENABLE); DYNAMIC_ALL_FUNC_ENABLE);
} }
/* set channel, bwmode */ /* set channel, bwmode */
p = rtw_get_ie23a((pnetwork->IEs + sizeof(struct ndis_802_11_fixed_ies)), p = cfg80211_find_ie(WLAN_EID_HT_OPERATION,
WLAN_EID_HT_OPERATION, &ie_len, (pnetwork->IELength - pnetwork->IEs +
sizeof(struct ndis_802_11_fixed_ies))); sizeof(struct ndis_802_11_fixed_ies),
if (p && ie_len) { pnetwork->IELength -
pht_info = (struct HT_info_element *)(p+2); sizeof(struct ndis_802_11_fixed_ies));
if (p && p[1]) {
if ((pregpriv->cbw40_enable) && (pht_info->infos[0] & BIT(2))) { pht_info = (struct HT_info_element *)(p + 2);
if (pregpriv->cbw40_enable && pht_info->infos[0] & BIT(2)) {
/* switch to the 40M Hz mode */ /* switch to the 40M Hz mode */
cur_bwmode = HT_CHANNEL_WIDTH_40; cur_bwmode = HT_CHANNEL_WIDTH_40;
switch (pht_info->infos[0] & 0x3) { switch (pht_info->infos[0] & 0x3) {
case 1: case 1:
/* pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_LOWER; */ /* pmlmeext->cur_ch_offset =
HAL_PRIME_CHNL_OFFSET_LOWER; */
cur_ch_offset = HAL_PRIME_CHNL_OFFSET_LOWER; cur_ch_offset = HAL_PRIME_CHNL_OFFSET_LOWER;
break; break;
case 3: case 3:
......
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