Revert "Cumulative patch from commit 4ec1fd8e42bad9390f14a58225b6e5f6fb691950"
This reverts commit 78a5dac804c22aa6e4ec8226a864d3b0d6ccddbb.
Test: None
diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index 0d86b4a..d7db4a7 100644
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -1117,20 +1117,6 @@
pos += ret;
}
#endif /* CONFIG_SAE */
-#ifdef CONFIG_FILS
- if (hapd->conf->wpa_key_mgmt & WPA_KEY_MGMT_FT_FILS_SHA256) {
- ret = os_snprintf(pos, end - pos, "FT-FILS-SHA256 ");
- if (os_snprintf_error(end - pos, ret))
- return pos - buf;
- pos += ret;
- }
- if (hapd->conf->wpa_key_mgmt & WPA_KEY_MGMT_FT_FILS_SHA384) {
- ret = os_snprintf(pos, end - pos, "FT-FILS-SHA384 ");
- if (os_snprintf_error(end - pos, ret))
- return pos - buf;
- pos += ret;
- }
-#endif /* CONFIG_FILS */
#endif /* CONFIG_IEEE80211R */
#ifdef CONFIG_IEEE80211W
if (hapd->conf->wpa_key_mgmt & WPA_KEY_MGMT_PSK_SHA256) {
@@ -1168,20 +1154,6 @@
return pos - buf;
pos += ret;
}
-#ifdef CONFIG_FILS
- if (hapd->conf->wpa_key_mgmt & WPA_KEY_MGMT_FILS_SHA256) {
- ret = os_snprintf(pos, end - pos, "FILS-SHA256 ");
- if (os_snprintf_error(end - pos, ret))
- return pos - buf;
- pos += ret;
- }
- if (hapd->conf->wpa_key_mgmt & WPA_KEY_MGMT_FILS_SHA384) {
- ret = os_snprintf(pos, end - pos, "FILS-SHA384 ");
- if (os_snprintf_error(end - pos, ret))
- return pos - buf;
- pos += ret;
- }
-#endif /* CONFIG_FILS */
if (pos > buf && *(pos - 1) == ' ') {
*(pos - 1) = '\0';
@@ -2083,9 +2055,8 @@
int ret;
os_reltime_sub(&now, &info->last_seen, &age);
- ret = os_snprintf(pos, end - pos, MACSTR " %u %d\n",
- MAC2STR(info->addr), (unsigned int) age.sec,
- info->ssi_signal);
+ ret = os_snprintf(pos, end - pos, MACSTR " %u\n",
+ MAC2STR(info->addr), (unsigned int) age.sec);
if (os_snprintf_error(end - pos, ret))
break;
pos += ret;
@@ -2174,7 +2145,6 @@
struct wpa_ssid_value ssid;
u8 bssid[ETH_ALEN];
struct wpabuf *nr, *lci = NULL, *civic = NULL;
- int stationary = 0;
char *tmp;
int ret;
@@ -2253,15 +2223,8 @@
}
}
- if (!buf)
- goto set;
-
- if (os_strstr(buf, "stat"))
- stationary = 1;
-
set:
- ret = hostapd_neighbor_set(hapd, bssid, &ssid, nr, lci, civic,
- stationary);
+ ret = hostapd_neighbor_set(hapd, bssid, &ssid, nr, lci, civic);
wpabuf_free(nr);
wpabuf_free(lci);
@@ -3515,6 +3478,8 @@
}
}
+ dl_list_init(&interface->global_ctrl_dst);
+ interface->global_ctrl_sock = -1;
os_get_random(gcookie, COOKIE_LEN);
#ifdef CONFIG_CTRL_IFACE_UDP_REMOTE