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/ap/hs20.c b/src/ap/hs20.c
index 532580e..98d016d 100644
--- a/src/ap/hs20.c
+++ b/src/ap/hs20.c
@@ -25,20 +25,17 @@
 	if (!hapd->conf->hs20)
 		return eid;
 	*eid++ = WLAN_EID_VENDOR_SPECIFIC;
-	*eid++ = hapd->conf->hs20_release < 2 ? 5 : 7;
+	*eid++ = 7;
 	WPA_PUT_BE24(eid, OUI_WFA);
 	eid += 3;
 	*eid++ = HS20_INDICATION_OUI_TYPE;
-	conf = (hapd->conf->hs20_release - 1) << 4; /* Release Number */
-	if (hapd->conf->hs20_release >= 2)
-		conf |= HS20_ANQP_DOMAIN_ID_PRESENT;
+	conf = HS20_VERSION; /* Release Number */
+	conf |= HS20_ANQP_DOMAIN_ID_PRESENT;
 	if (hapd->conf->disable_dgaf)
 		conf |= HS20_DGAF_DISABLED;
 	*eid++ = conf;
-	if (hapd->conf->hs20_release >= 2) {
-		WPA_PUT_LE16(eid, hapd->conf->anqp_domain_id);
-		eid += 2;
-	}
+	WPA_PUT_LE16(eid, hapd->conf->anqp_domain_id);
+	eid += 2;
 
 	return eid;
 }
@@ -87,10 +84,6 @@
 			capab |= WPA_CAPABILITY_MFPR;
 	}
 #endif /* CONFIG_IEEE80211W */
-#ifdef CONFIG_OCV
-	if (hapd->conf->ocv)
-		capab |= WPA_CAPABILITY_OCVC;
-#endif /* CONFIG_OCV */
 	WPA_PUT_LE16(eid, capab);
 	eid += 2;
 
@@ -191,14 +184,13 @@
 {
 	struct wpabuf *buf;
 	int ret;
-	size_t url_len;
+	size_t url_len = os_strlen(url);
 
 	if (!url) {
 		wpa_printf(MSG_INFO, "HS 2.0: No T&C Server URL available");
 		return -1;
 	}
 
-	url_len = os_strlen(url);
 	if (5 + url_len > 255) {
 		wpa_printf(MSG_INFO,
 			   "HS 2.0: Too long T&C Server URL for WNM-Notification: '%s'",