移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_ap.c
..
..
@@ -2089,7 +2089,7 @@
2089
2089
 	psecuritypriv->akmp = 0;
2090
2090
 	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _RSN_IE_2_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_));
2091
2091
 	if (p && ie_len > 0) {
2092
-		if (rtw_parse_wpa2_ie(p, ie_len + 2, &group_cipher, &pairwise_cipher, &gmcs, &akm, &mfp_opt, NULL) == _SUCCESS) {
2092
+		if (rtw_parse_wpa2_ie(p, ie_len + 2, &group_cipher, &pairwise_cipher, &gmcs, &akm, &mfp_opt) == _SUCCESS) {
2093
2093
 			psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X;
2094
2094
 			psecuritypriv->ndisauthtype = Ndis802_11AuthModeWPA2PSK;
2095
2095
 			psecuritypriv->dot8021xalg = 1;/* psk,  todo:802.1x */
..
..
@@ -2227,7 +2227,11 @@
2227
2227
 	}
2228
2228
 	psecuritypriv->mfp_opt = mfp_opt;
2229
2229
 
2230
-	rm_update_cap(pbuf, padapter, len, _BEACON_IE_OFFSET_);
2230
+#ifdef CONFIG_RTW_80211K
2231
+	/* RRM */
2232
+	update_rm_cap(pbuf, padapter, len, _BEACON_IE_OFFSET_);
2233
+
2234
+#endif /* CONFIG_RTW_80211K */
2231
2235
 
2232
2236
 	/* wmm */
2233
2237
 	ie_len = 0;
..
..
@@ -5226,7 +5230,6 @@
5226
5230
 	int group_cipher = 0, pairwise_cipher = 0, gmcs = 0;
5227
5231
 	u32 akm = 0;
5228
5232
 	u8 mfp_opt = MFP_NO;
5229
-	u8 spp_opt = 0;
5230
5233
 	u16 status = _STATS_SUCCESSFUL_;
5231
5234
 
5232
5235
 	sta->dot8021xalg = 0;
..
..
@@ -5241,7 +5244,7 @@
5241
5244
 		wpa_ie = elems->rsn_ie;
5242
5245
 		wpa_ie_len = elems->rsn_ie_len;
5243
5246
 
5244
-		if (rtw_parse_wpa2_ie(wpa_ie - 2, wpa_ie_len + 2, &group_cipher, &pairwise_cipher, &gmcs, &akm, &mfp_opt, &spp_opt) == _SUCCESS) {
5247
+		if (rtw_parse_wpa2_ie(wpa_ie - 2, wpa_ie_len + 2, &group_cipher, &pairwise_cipher, &gmcs, &akm, &mfp_opt) == _SUCCESS) {
5245
5248
 			sta->dot8021xalg = 1;/* psk, todo:802.1x */
5246
5249
 			sta->wpa_psk |= BIT(1);
5247
5250
 
..
..
@@ -5303,11 +5306,6 @@
5303
5306
 	} else {
5304
5307
 		wpa_ie = NULL;
5305
5308
 		wpa_ie_len = 0;
5306
-	}
5307
-	if (sec->dot11PrivacyAlgrthm != _NO_PRIVACY_) {
5308
-		/*check if amsdu is allowed */
5309
-		if (rtw_check_amsdu_disable(adapter->registrypriv.amsdu_mode, spp_opt) == _TRUE)
5310
-			sta->flags |= WLAN_STA_AMSDU_DISABLE;
5311
5309
 	}
5312
5310
 
5313
5311
 	if ((sec->mfp_opt == MFP_REQUIRED && mfp_opt < MFP_OPTIONAL)