AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/mesh/rtw_mesh.c
..
..
@@ -248,7 +248,7 @@
248
248
 		rsn_ie = rtw_get_wpa2_ie(BSS_EX_TLV_IES(target), &rsn_ie_len, BSS_EX_TLV_IES_LEN(target));
249
249
 		if (!rsn_ie || rsn_ie_len == 0)
250
250
 			goto exit;
251
-		if (rtw_parse_wpa2_ie(rsn_ie, rsn_ie_len + 2, &group_cipher, &pairwise_cipher, &gmcs, NULL, &mfp_opt, NULL) != _SUCCESS)
251
+		if (rtw_parse_wpa2_ie(rsn_ie, rsn_ie_len + 2, &group_cipher, &pairwise_cipher, &gmcs, NULL, &mfp_opt) != _SUCCESS)
252
252
 			goto exit;
253
253
 		if ((sec->mfp_opt == MFP_REQUIRED && mfp_opt < MFP_OPTIONAL)
254
254
 			|| (mfp_opt == MFP_REQUIRED && sec->mfp_opt < MFP_OPTIONAL))
..
..
@@ -1171,7 +1171,7 @@
1171
1171
 				rsn_ie = rtw_get_wpa2_ie(BSS_EX_TLV_IES(&network->network)
1172
1172
 							, &rsn_ie_len, BSS_EX_TLV_IES_LEN(&network->network));
1173
1173
 				if (rsn_ie && rsn_ie_len)
1174
-					rtw_parse_wpa2_ie(rsn_ie, rsn_ie_len + 2, &gcs, &pcs, &gmcs, NULL, &mfp_opt, NULL);
1174
+					rtw_parse_wpa2_ie(rsn_ie, rsn_ie_len + 2, &gcs, &pcs, &gmcs, NULL, &mfp_opt);
1175
1175
 			}
1176
1176
 			RTW_PRINT_SEL(sel, "* "MAC_FMT" %3d            %-32s %2x%2x%2x%2x%2x"
1177
1177
 				" %03x %03x %c%03x"
..
..
@@ -1213,7 +1213,7 @@
1213
1213
 		if (auth_pid && auth_pid <= 2) {
1214
1214
 			rsn_ie = rtw_get_wpa2_ie(BSS_EX_TLV_IES(&network->network), &rsn_ie_len, BSS_EX_TLV_IES_LEN(&network->network));
1215
1215
 			if (rsn_ie && rsn_ie_len)
1216
-				rtw_parse_wpa2_ie(rsn_ie, rsn_ie_len + 2, &gcs, &pcs, &gmcs, NULL, &mfp_opt, NULL);
1216
+				rtw_parse_wpa2_ie(rsn_ie, rsn_ie_len + 2, &gcs, &pcs, &gmcs, NULL, &mfp_opt);
1217
1217
 		}
1218
1218
 		age_ms = rtw_get_passing_time_ms(network->last_scanned);
1219
1219
 		#if CONFIG_RTW_MESH_ACNODE_PREVENT