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/p2p/p2p.h b/src/p2p/p2p.h
index f2969ee..fac5ce0 100644
--- a/src/p2p/p2p.h
+++ b/src/p2p/p2p.h
@@ -104,11 +104,6 @@
unsigned int vht_center_freq2;
/**
- * he - Indicates if IEEE 802.11ax HE is enabled
- */
- int he;
-
- /**
* ssid - SSID of the group
*/
u8 ssid[SSID_MAX_LEN];
@@ -2010,8 +2005,6 @@
* @p2p: P2P config
* @op_class: Selected operating class
* @op_channel: Selected social channel
- * @avoid_list: Channel ranges to try to avoid or %NULL
- * @disallow_list: Channel ranges to discard or %NULL
* Returns: 0 on success, -1 on failure
*
* This function is used before p2p_init is called. A random social channel
@@ -2019,9 +2012,7 @@
* returned on success.
*/
int p2p_config_get_random_social(struct p2p_config *p2p, u8 *op_class,
- u8 *op_channel,
- struct wpa_freq_range_list *avoid_list,
- struct wpa_freq_range_list *disallow_list);
+ u8 *op_channel);
int p2p_set_listen_channel(struct p2p_data *p2p, u8 reg_class, u8 channel,
u8 forced);