From cde9070d9970eef1f7ec2360586c802a16230ad8 Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Fri, 10 May 2024 07:43:50 +0000 Subject: [PATCH] rtl88x2CE_WiFi_linux driver --- kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_ap.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_ap.c b/kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_ap.c index da3db56..bd4632e 100644 --- a/kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_ap.c +++ b/kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_ap.c @@ -2089,7 +2089,7 @@ psecuritypriv->akmp = 0; p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _RSN_IE_2_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_)); if (p && ie_len > 0) { - if (rtw_parse_wpa2_ie(p, ie_len + 2, &group_cipher, &pairwise_cipher, &gmcs, &akm, &mfp_opt, NULL) == _SUCCESS) { + if (rtw_parse_wpa2_ie(p, ie_len + 2, &group_cipher, &pairwise_cipher, &gmcs, &akm, &mfp_opt) == _SUCCESS) { psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; psecuritypriv->ndisauthtype = Ndis802_11AuthModeWPA2PSK; psecuritypriv->dot8021xalg = 1;/* psk, todo:802.1x */ @@ -2227,7 +2227,11 @@ } psecuritypriv->mfp_opt = mfp_opt; - rm_update_cap(pbuf, padapter, len, _BEACON_IE_OFFSET_); +#ifdef CONFIG_RTW_80211K + /* RRM */ + update_rm_cap(pbuf, padapter, len, _BEACON_IE_OFFSET_); + +#endif /* CONFIG_RTW_80211K */ /* wmm */ ie_len = 0; @@ -5226,7 +5230,6 @@ int group_cipher = 0, pairwise_cipher = 0, gmcs = 0; u32 akm = 0; u8 mfp_opt = MFP_NO; - u8 spp_opt = 0; u16 status = _STATS_SUCCESSFUL_; sta->dot8021xalg = 0; @@ -5241,7 +5244,7 @@ wpa_ie = elems->rsn_ie; wpa_ie_len = elems->rsn_ie_len; - if (rtw_parse_wpa2_ie(wpa_ie - 2, wpa_ie_len + 2, &group_cipher, &pairwise_cipher, &gmcs, &akm, &mfp_opt, &spp_opt) == _SUCCESS) { + if (rtw_parse_wpa2_ie(wpa_ie - 2, wpa_ie_len + 2, &group_cipher, &pairwise_cipher, &gmcs, &akm, &mfp_opt) == _SUCCESS) { sta->dot8021xalg = 1;/* psk, todo:802.1x */ sta->wpa_psk |= BIT(1); @@ -5303,11 +5306,6 @@ } else { wpa_ie = NULL; wpa_ie_len = 0; - } - if (sec->dot11PrivacyAlgrthm != _NO_PRIVACY_) { - /*check if amsdu is allowed */ - if (rtw_check_amsdu_disable(adapter->registrypriv.amsdu_mode, spp_opt) == _TRUE) - sta->flags |= WLAN_STA_AMSDU_DISABLE; } if ((sec->mfp_opt == MFP_REQUIRED && mfp_opt < MFP_OPTIONAL) -- Gitblit v1.6.2