Revert "[wpa_supplicant] Cumulative patch from c4e90da6d"
This reverts commit 39bc25d3a79c1375de430a7918d949c1a86f70c6.
Test: Compilation
Change-Id: Iae7670429466958911b5296cb1359bceecc0b03e
Exempt-From-Owner-Approval: Revert since it's breaking the build
diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 23423d9..d34c679 100644
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -58,16 +58,6 @@
#define HOSTAPD_CHAN_VHT_130_30 0x04000000
#define HOSTAPD_CHAN_VHT_150_10 0x08000000
-/* Allowed bandwidth mask */
-enum hostapd_chan_width_attr {
- HOSTAPD_CHAN_WIDTH_10 = BIT(0),
- HOSTAPD_CHAN_WIDTH_20 = BIT(1),
- HOSTAPD_CHAN_WIDTH_40P = BIT(2),
- HOSTAPD_CHAN_WIDTH_40M = BIT(3),
- HOSTAPD_CHAN_WIDTH_80 = BIT(4),
- HOSTAPD_CHAN_WIDTH_160 = BIT(5),
-};
-
/* Filter gratuitous ARP */
#define WPA_DATA_FRAME_FILTER_FLAG_ARP BIT(0)
/* Filter unsolicited Neighbor Advertisement */
@@ -121,13 +111,6 @@
int flag;
/**
- * allowed_bw - Allowed channel width bitmask
- *
- * See enum hostapd_chan_width_attr.
- */
- u32 allowed_bw;
-
- /**
* max_tx_power - Regulatory transmit power limit in dBm
*/
u8 max_tx_power;
@@ -931,10 +914,10 @@
* passphrase - RSN passphrase for PSK
*
* This value is made available only for WPA/WPA2-Personal (PSK) and
- * only for drivers that set WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK. This
- * is the 8..63 character ASCII passphrase, if available. Please note
- * that this can be %NULL if passphrase was not used to generate the
- * PSK. In that case, the psk field must be used to fetch the PSK.
+ * only for drivers that set WPA_DRIVER_FLAGS_4WAY_HANDSHAKE. This is
+ * the 8..63 character ASCII passphrase, if available. Please note that
+ * this can be %NULL if passphrase was not used to generate the PSK. In
+ * that case, the psk field must be used to fetch the PSK.
*/
const char *passphrase;
@@ -942,9 +925,9 @@
* psk - RSN PSK (alternative for passphrase for PSK)
*
* This value is made available only for WPA/WPA2-Personal (PSK) and
- * only for drivers that set WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK. This
- * is the 32-octet (256-bit) PSK, if available. The driver wrapper
- * should be prepared to handle %NULL value as an error.
+ * only for drivers that set WPA_DRIVER_FLAGS_4WAY_HANDSHAKE. This is
+ * the 32-octet (256-bit) PSK, if available. The driver wrapper should
+ * be prepared to handle %NULL value as an error.
*/
const u8 *psk;
@@ -1384,23 +1367,6 @@
* service).
*/
int multicast_to_unicast;
-
- /**
- * ftm_responder - Whether FTM responder is enabled
- */
- int ftm_responder;
-
- /**
- * lci - Binary data, the content of an LCI report IE with type 8 as
- * defined in IEEE Std 802.11-2016, 9.4.2.22.10
- */
- const struct wpabuf *lci;
-
- /**
- * civic - Binary data, the content of a measurement report IE with
- * type 11 as defined in IEEE Std 802.11-2016, 9.4.2.22.13
- */
- const struct wpabuf *civic;
};
struct wpa_driver_mesh_bss_params {
@@ -1458,7 +1424,6 @@
#define WPA_DRIVER_CAPA_KEY_MGMT_FILS_SHA384 0x00002000
#define WPA_DRIVER_CAPA_KEY_MGMT_FT_FILS_SHA256 0x00004000
#define WPA_DRIVER_CAPA_KEY_MGMT_FT_FILS_SHA384 0x00008000
-#define WPA_DRIVER_CAPA_KEY_MGMT_SAE 0x00010000
/** Bitfield of supported key management suites */
unsigned int key_mgmt;
@@ -1492,7 +1457,7 @@
#define WPA_DRIVER_FLAGS_DFS_OFFLOAD 0x00000004
/** Driver takes care of RSN 4-way handshake internally; PMK is configured with
* struct wpa_driver_ops::set_key using alg = WPA_ALG_PMK */
-#define WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_8021X 0x00000008
+#define WPA_DRIVER_FLAGS_4WAY_HANDSHAKE 0x00000008
/** Driver is for a wired Ethernet interface */
#define WPA_DRIVER_FLAGS_WIRED 0x00000010
/** Driver provides separate commands for authentication and association (SME in
@@ -1614,10 +1579,6 @@
#define WPA_DRIVER_FLAGS_MFP_OPTIONAL 0x0040000000000000ULL
/** Driver is a self-managed regulatory device */
#define WPA_DRIVER_FLAGS_SELF_MANAGED_REGULATORY 0x0080000000000000ULL
-/** Driver supports FTM responder functionality */
-#define WPA_DRIVER_FLAGS_FTM_RESPONDER 0x0100000000000000ULL
-/** Driver support 4-way handshake offload for WPA-Personal */
-#define WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK 0x0200000000000000ULL
u64 flags;
#define FULL_AP_CLIENT_STATE_SUPP(drv_flags) \
@@ -1941,21 +1902,19 @@
SMPS_INVALID,
};
-#define WPA_INVALID_NOISE 9999
+/* enum chan_width - Channel width definitions */
+enum chan_width {
+ CHAN_WIDTH_20_NOHT,
+ CHAN_WIDTH_20,
+ CHAN_WIDTH_40,
+ CHAN_WIDTH_80,
+ CHAN_WIDTH_80P80,
+ CHAN_WIDTH_160,
+ CHAN_WIDTH_UNKNOWN
+};
/**
* struct wpa_signal_info - Information about channel signal quality
- * @frequency: control frequency
- * @above_threshold: true if the above threshold was crossed
- * (relevant for a CQM event)
- * @current_signal: in dBm
- * @avg_signal: in dBm
- * @avg_beacon_signal: in dBm
- * @current_noise: %WPA_INVALID_NOISE if not supported
- * @current_txrate: current TX rate
- * @chanwidth: channel width
- * @center_frq1: center frequency for the first segment
- * @center_frq2: center frequency for the second segment (if relevant)
*/
struct wpa_signal_info {
u32 frequency;
@@ -1971,26 +1930,6 @@
};
/**
- * struct wpa_channel_info - Information about the current channel
- * @frequency: Center frequency of the primary 20 MHz channel
- * @chanwidth: Width of the current operating channel
- * @sec_channel: Location of the secondary 20 MHz channel (either +1 or -1).
- * This field is only filled in when using a 40 MHz channel.
- * @center_frq1: Center frequency of frequency segment 0
- * @center_frq2: Center frequency of frequency segment 1 (for 80+80 channels)
- * @seg1_idx: Frequency segment 1 index when using a 80+80 channel. This is
- * derived from center_frq2 for convenience.
- */
-struct wpa_channel_info {
- u32 frequency;
- enum chan_width chanwidth;
- int sec_channel;
- int center_frq1;
- int center_frq2;
- u8 seg1_idx;
-};
-
-/**
* struct beacon_data - Beacon data
* @head: Head portion of Beacon frame (before TIM IE)
* @tail: Tail portion of Beacon frame (after TIM IE)
@@ -3426,14 +3365,6 @@
int (*signal_poll)(void *priv, struct wpa_signal_info *signal_info);
/**
- * channel_info - Get parameters of the current operating channel
- * @priv: Private driver interface data
- * @channel_info: Channel info structure
- * Returns: 0 on success, negative (<0) on failure
- */
- int (*channel_info)(void *priv, struct wpa_channel_info *channel_info);
-
- /**
* set_authmode - Set authentication algorithm(s) for static WEP
* @priv: Private driver interface data
* @authmode: 1=Open System, 2=Shared Key, 3=both
@@ -3714,7 +3645,7 @@
/**
* status - Get driver interface status information
* @priv: Private driver interface data
- * @buf: Buffer for printing the status information
+ * @buf: Buffer for printing tou the status information
* @buflen: Maximum length of the buffer
* Returns: Length of written status information or -1 on failure
*/
@@ -3838,14 +3769,6 @@
int (*set_transmit_next_pn)(void *priv, struct transmit_sa *sa);
/**
- * set_receive_lowest_pn - Set receive lowest PN
- * @priv: Private driver interface data
- * @sa: secure association
- * Returns: 0 on success, -1 on failure (or if not supported)
- */
- int (*set_receive_lowest_pn)(void *priv, struct receive_sa *sa);
-
- /**
* create_receive_sc - create secure channel for receiving
* @priv: Private driver interface data
* @sc: secure channel
@@ -4156,15 +4079,6 @@
*/
int (*send_external_auth_status)(void *priv,
struct external_auth *params);
-
- /**
- * set_4addr_mode - Set 4-address mode
- * @priv: Private driver interface data
- * @bridge_ifname: Bridge interface name
- * @val: 0 - disable 4addr mode, 1 - enable 4addr mode
- * Returns: 0 on success, < 0 on failure
- */
- int (*set_4addr_mode)(void *priv, const char *bridge_ifname, int val);
};
/**
@@ -5607,8 +5521,6 @@
/* Convert chan_width to a string for logging and control interfaces */
const char * channel_width_to_string(enum chan_width width);
-int channel_width_to_int(enum chan_width width);
-
int ht_supported(const struct hostapd_hw_modes *mode);
int vht_supported(const struct hostapd_hw_modes *mode);