Revert "[wpa_supplicant] cumilative patch from commit 4b755c967"
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: I6c9b7a4323fa7edde47617da6c1e0d8f6e6d5101
diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 069e741..a55e8e3 100644
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -43,7 +43,6 @@
#define HOSTAPD_CHAN_VHT_80MHZ_SUBCHANNEL 0x00000800
#define HOSTAPD_CHAN_VHT_160MHZ_SUBCHANNEL 0x00001000
-#define HOSTAPD_CHAN_EHT_320MHZ_SUBCHANNEL 0x00002000
#define HOSTAPD_CHAN_INDOOR_ONLY 0x00010000
#define HOSTAPD_CHAN_GO_CONCURRENT 0x00020000
@@ -248,11 +247,6 @@
enum hostapd_hw_mode mode;
/**
- * is_6ghz - Whether the mode information is for the 6 GHz band
- */
- bool is_6ghz;
-
- /**
* num_channels - Number of entries in the channels array
*/
int num_channels;
@@ -701,14 +695,6 @@
*/
unsigned int min_probe_req_content:1;
- /**
- * link_id - Specify the link that is requesting the scan on an MLD
- *
- * This is set when operating as an AP MLD and doing an OBSS scan.
- * -1 indicates that no particular link ID is set.
- */
- s8 link_id;
-
/*
* NOTE: Whenever adding new parameters here, please make sure
* wpa_scan_clone_params() and wpa_scan_free_params() get updated with
@@ -3385,17 +3371,6 @@
size_t ies_len);
/**
- * get_scan_results - Fetch the latest scan results
- * @priv: Private driver interface data
- * @bssid: Return results only for the specified BSSID, %NULL for all
- *
- * Returns: Allocated buffer of scan results (caller is responsible for
- * freeing the data structure) on success, NULL on failure
- */
- struct wpa_scan_results * (*get_scan_results)(void *priv,
- const u8 *bssid);
-
- /**
* get_scan_results2 - Fetch the latest scan results
* @priv: private driver interface data
*
@@ -4579,14 +4554,13 @@
/**
* stop_ap - Removes beacon from AP
* @priv: Private driver interface data
- * @link_id: Link ID of the specified link; -1 for non-MLD
* Returns: 0 on success, -1 on failure (or if not supported)
*
* This optional function can be used to disable AP mode related
* configuration. Unlike deinit_ap, it does not change to station
* mode.
*/
- int (*stop_ap)(void *priv, int link_id);
+ int (*stop_ap)(void *priv);
/**
* get_survey - Retrieve survey data
@@ -5166,44 +5140,9 @@
* @priv: Private driver interface data
* @link_id: The link ID
* @addr: The MAC address to use for the link
- * @bss_ctx: BSS context for %WPA_IF_AP_BSS interfaces
* Returns: 0 on success, negative value on failure
*/
- int (*link_add)(void *priv, u8 link_id, const u8 *addr, void *bss_ctx);
-
- /**
- * link_remove - Remove a link from the AP MLD interface
- * @priv: Private driver interface data
- * @type: Interface type
- * @ifname: Interface name of the virtual interface from where the link
- * is to be removed.
- * @link_id: Valid link ID to remove
- * Returns: 0 on success, -1 on failure
- */
- int (*link_remove)(void *priv, enum wpa_driver_if_type type,
- const char *ifname, u8 link_id);
-
- /**
- * is_drv_shared - Check whether the driver interface is shared
- * @priv: Private driver interface data from init()
- * @bss_ctx: BSS context for %WPA_IF_AP_BSS interfaces
- *
- * Checks whether the driver interface is being used by other partner
- * BSS(s) or not. This is used to decide whether the driver interface
- * needs to be deinitilized when one interface is getting deinitialized.
- *
- * Returns: true if it is being used or else false.
- */
- bool (*is_drv_shared)(void *priv, void *bss_ctx);
-
- /**
- * link_sta_remove - Remove a link STA from an MLD STA
- * @priv: Private driver interface data
- * @link_id: The link ID which the link STA is using
- * @addr: The MLD MAC address of the MLD STA
- * Returns: 0 on success, negative value on failure
- */
- int (*link_sta_remove)(void *priv, u8 link_id, const u8 *addr);
+ int (*link_add)(void *priv, u8 link_id, const u8 *addr);
#ifdef CONFIG_TESTING_OPTIONS
int (*register_frame)(void *priv, u16 type,
@@ -6413,8 +6352,6 @@
* (if available).
* @scan_start_tsf_bssid: The BSSID according to which %scan_start_tsf
* is set.
- * @scan_cookie: Unique identification representing the corresponding
- * scan request. 0 if no unique identification is available.
*/
struct scan_info {
int aborted;
@@ -6426,7 +6363,6 @@
int nl_scan_event;
u64 scan_start_tsf;
u8 scan_start_tsf_bssid[ETH_ALEN];
- u64 scan_cookie;
} scan_info;
/**