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/sta_info.c b/src/ap/sta_info.c
index 8858a34..179cf43 100644
--- a/src/ap/sta_info.c
+++ b/src/ap/sta_info.c
@@ -166,7 +166,7 @@
/* just in case */
ap_sta_set_authorized(hapd, sta, 0);
- if (sta->flags & (WLAN_STA_WDS | WLAN_STA_MULTI_AP))
+ if (sta->flags & WLAN_STA_WDS)
hostapd_set_wds_sta(hapd, NULL, sta->addr, sta->aid, 0);
if (sta->ipaddr)
@@ -328,7 +328,6 @@
os_free(sta->ht_capabilities);
os_free(sta->vht_capabilities);
- os_free(sta->vht_operation);
hostapd_free_psk_list(sta->psk);
os_free(sta->identity);
os_free(sta->radius_cui);
@@ -897,6 +896,9 @@
struct hostapd_vlan *vlan = NULL, *wildcard_vlan = NULL;
int old_vlan_id, vlan_id = 0, ret = 0;
+ if (hapd->conf->ssid.dynamic_vlan == DYNAMIC_VLAN_DISABLED)
+ vlan_desc = NULL;
+
/* Check if there is something to do */
if (hapd->conf->ssid.per_sta_vif && !sta->vlan_id) {
/* This sta is lacking its own vif */
@@ -1163,32 +1165,6 @@
#endif /* CONFIG_IEEE80211W */
-const char * ap_sta_wpa_get_keyid(struct hostapd_data *hapd,
- struct sta_info *sta)
-{
- struct hostapd_wpa_psk *psk;
- struct hostapd_ssid *ssid;
- const u8 *pmk;
- int pmk_len;
-
- ssid = &hapd->conf->ssid;
-
- pmk = wpa_auth_get_pmk(sta->wpa_sm, &pmk_len);
- if (!pmk || pmk_len != PMK_LEN)
- return NULL;
-
- for (psk = ssid->wpa_psk; psk; psk = psk->next)
- if (os_memcmp(pmk, psk->psk, PMK_LEN) == 0)
- break;
- if (!psk)
- return NULL;
- if (!psk || !psk->keyid[0])
- return NULL;
-
- return psk->keyid;
-}
-
-
void ap_sta_set_authorized(struct hostapd_data *hapd, struct sta_info *sta,
int authorized)
{
@@ -1227,11 +1203,7 @@
sta->addr, authorized, dev_addr);
if (authorized) {
- const char *keyid;
- char keyid_buf[100];
char ip_addr[100];
-
- keyid_buf[0] = '\0';
ip_addr[0] = '\0';
#ifdef CONFIG_P2P
if (wpa_auth_get_ip_addr(sta->wpa_sm, ip_addr_buf) == 0) {
@@ -1242,20 +1214,14 @@
}
#endif /* CONFIG_P2P */
- keyid = ap_sta_wpa_get_keyid(hapd, sta);
- if (keyid) {
- os_snprintf(keyid_buf, sizeof(keyid_buf),
- " keyid=%s", keyid);
- }
-
- wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_CONNECTED "%s%s%s",
- buf, ip_addr, keyid_buf);
+ wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_CONNECTED "%s%s",
+ buf, ip_addr);
if (hapd->msg_ctx_parent &&
hapd->msg_ctx_parent != hapd->msg_ctx)
wpa_msg_no_global(hapd->msg_ctx_parent, MSG_INFO,
- AP_STA_CONNECTED "%s%s%s",
- buf, ip_addr, keyid_buf);
+ AP_STA_CONNECTED "%s%s",
+ buf, ip_addr);
} else {
wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_DISCONNECTED "%s", buf);