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.h b/wpa_supplicant/config.h
index 56d5c61..09bcbc8 100644
--- a/wpa_supplicant/config.h
+++ b/wpa_supplicant/config.h
@@ -48,7 +48,6 @@
#define DEFAULT_EXTENDED_KEY_ID 0
#define DEFAULT_BTM_OFFLOAD 0
#define DEFAULT_SCAN_RES_VALID_FOR_CONNECT 5
-#define DEFAULT_MLD_CONNECT_BAND_PREF MLD_CONNECT_BAND_PREF_AUTO
#include "config_ssid.h"
#include "wps/wps.h"
@@ -452,8 +451,7 @@
#define CFG_CHANGED_WOWLAN_TRIGGERS BIT(18)
#define CFG_CHANGED_DISABLE_BTM BIT(19)
#define CFG_CHANGED_BGSCAN BIT(20)
-#define CFG_CHANGED_FT_PREPEND_PMKID BIT(21)
-#define CFG_CHANGED_DISABLE_BTM_NOTIFY BIT(22)
+#define CFG_CHANGED_DISABLE_BTM_NOTIFY BIT(21)
/**
* struct wpa_config - wpa_supplicant configuration data
@@ -728,14 +726,6 @@
unsigned int dot11RSNAConfigSATimeout;
/**
- * ft_prepend_pmkid - Whether to prepend PMKR1Name with PMKIDs
- *
- * This control whether PMKR1Name is prepended to the PMKID list
- * insread of replacing the full list when constructing RSNE for
- * EAPOL-Key msg 2/4 for FT cases. */
- bool ft_prepend_pmkid;
-
- /**
* update_config - Is wpa_supplicant allowed to update configuration
*
* This variable control whether wpa_supplicant is allow to re-write
@@ -1816,20 +1806,6 @@
#endif /* CONFIG_TESTING_OPTIONS */
#endif /* CONFIG_PASN*/
-
-#ifdef CONFIG_TESTING_OPTIONS
- enum {
- MLD_CONNECT_BAND_PREF_AUTO = 0,
- MLD_CONNECT_BAND_PREF_2GHZ = 1,
- MLD_CONNECT_BAND_PREF_5GHZ = 2,
- MLD_CONNECT_BAND_PREF_6GHZ = 3,
- MLD_CONNECT_BAND_PREF_MAX = 4,
- } mld_connect_band_pref;
-
- u8 mld_connect_bssid_pref[ETH_ALEN];
-
- int mld_force_single_link;
-#endif /* CONFIG_TESTING_OPTIONS */
};