Revert "[wpa_supplicant] cumilative patch from commit 3a5d1a7e6"
Revert submission 26533062-Supplicant_merge_June24
Reason for revert: https://b.corp.google.com/issues/349780869
Reverted changes: /q/submissionid:26533062-Supplicant_merge_June24
Change-Id: I4a7a5b8ccb6b4822353bacc29649587cd5a3cb80
diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index 8c0db68..d1d8ca3 100644
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -2368,7 +2368,7 @@
u8 mac_value[ETH_ALEN];
if (hwaddr_aton(value, mac_value) == 0) {
- if (ether_addr_equal(mac_value, ssid->mac_value))
+ if (os_memcmp(mac_value, ssid->mac_value, ETH_ALEN) == 0)
return 1;
os_memcpy(ssid->mac_value, mac_value, ETH_ALEN);
return 0;
@@ -4681,10 +4681,6 @@
config->driver_param = os_strdup(driver_param);
config->gas_rand_addr_lifetime = DEFAULT_RAND_ADDR_LIFETIME;
-#ifdef CONFIG_TESTING_OPTIONS
- config->mld_connect_band_pref = DEFAULT_MLD_CONNECT_BAND_PREF;
-#endif /* CONFIG_TESTING_OPTIONS */
-
return config;
}
@@ -5319,23 +5315,6 @@
#endif /* CONFIG_P2P */
-#ifdef CONFIG_TESTING_OPTIONS
-static int wpa_config_process_mld_connect_bssid_pref(
- const struct global_parse_data *data,
- struct wpa_config *config, int line, const char *pos)
-{
- if (hwaddr_aton2(pos, config->mld_connect_bssid_pref) < 0) {
- wpa_printf(MSG_ERROR,
- "Line %d: Invalid mld_connect_bssid_pref '%s'",
- line, pos);
- return -1;
- }
-
- return 0;
-}
-#endif /* CONFIG_TESTING_OPTIONS */
-
-
#ifdef OFFSET
#undef OFFSET
#endif /* OFFSET */
@@ -5552,15 +5531,6 @@
{ INT_RANGE(pasn_corrupt_mic, 0, 1), 0 },
#endif /* CONFIG_TESTING_OPTIONS */
#endif /* CONFIG_PASN */
-#ifdef CONFIG_TESTING_OPTIONS
- { INT_RANGE(mld_force_single_link, 0, 1), 0 },
- { INT_RANGE(mld_connect_band_pref, 0, MLD_CONNECT_BAND_PREF_MAX), 0 },
- { FUNC(mld_connect_bssid_pref), 0 },
-#endif /* CONFIG_TESTING_OPTIONS */
- { INT_RANGE(ft_prepend_pmkid, 0, 1), CFG_CHANGED_FT_PREPEND_PMKID },
- /* NOTE: When adding new parameters here, add_interface() in
- * wpa_supplicant/dbus_new_introspect.c may need to be modified to
- * increase the size of the iface->xml buffer. */
};
#undef FUNC