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/wpa_supplicant/config.h b/wpa_supplicant/config.h
index 4b84200..6eb0074 100644
--- a/wpa_supplicant/config.h
+++ b/wpa_supplicant/config.h
@@ -1079,16 +1079,6 @@
 	int p2p_go_vht;
 
 	/**
-	 * p2p_go_he - Default mode for 11ax HE enable when operating as GO
-	 *
-	 * This will take effect for p2p_group_add, p2p_connect, and p2p_invite.
-	 * Note that regulatory constraints and driver capabilities are
-	 * consulted anyway, so setting it to 1 can't do real harm.
-	 * By default: 0 (disabled)
-	 */
-	int p2p_go_he;
-
-	/**
 	 * p2p_go_ctwindow - CTWindow to use when operating as GO
 	 *
 	 * By default: 0 (no CTWindow). Values 0-127 can be used to indicate
@@ -1493,8 +1483,7 @@
 	 * p2p_device_random_mac_addr - P2P Device MAC address policy default
 	 *
 	 * 0 = use permanent MAC address
-	 * 1 = use random MAC address on creating the interface if there is no
-	 * persistent groups.
+	 * 1 = use random MAC address on creating the interface if there is no persistent groups.
 	 *
 	 * By default, permanent MAC address is used.
 	 */
@@ -1503,8 +1492,9 @@
 	/**
 	 * p2p_device_persistent_mac_addr - Record last used MAC address
 	 *
-	 * If there are saved persistent groups, P2P cannot generate another
-	 * random MAC address, and need to restore to last used MAC address.
+	 * If there are saved persistent groups, P2P cannot generate another random MAC address,
+	 * and need to restore to last used MAC address.
+	 * format: aa:bb:cc:dd:ee:ff
 	 */
 	u8 p2p_device_persistent_mac_addr[ETH_ALEN];