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/ap.c b/wpa_supplicant/ap.c
index 453c99d..ea846a0 100644
--- a/wpa_supplicant/ap.c
+++ b/wpa_supplicant/ap.c
@@ -334,9 +334,6 @@
list[8] = -1;
}
conf->supported_rates = list;
-#ifdef CONFIG_IEEE80211AX
- conf->ieee80211ax = ssid->he;
-#endif /* CONFIG_IEEE80211AX */
}
bss->isolate = !wpa_s->conf->p2p_intra_bss;
@@ -497,10 +494,6 @@
bss->ieee80211w = ssid->ieee80211w;
#endif /* CONFIG_IEEE80211W */
-#ifdef CONFIG_OCV
- bss->ocv = ssid->ocv;
-#endif /* CONFIG_OCV */
-
#ifdef CONFIG_WPS
/*
* Enable WPS by default for open and WPA/WPA2-Personal network, but
@@ -1386,16 +1379,13 @@
void wpas_ap_ch_switch(struct wpa_supplicant *wpa_s, int freq, int ht,
int offset, int width, int cf1, int cf2)
{
- struct hostapd_iface *iface = wpa_s->ap_iface;
-
- if (!iface)
- iface = wpa_s->ifmsh;
- if (!iface)
+ if (!wpa_s->ap_iface)
return;
+
wpa_s->assoc_freq = freq;
if (wpa_s->current_ssid)
wpa_s->current_ssid->frequency = freq;
- hostapd_event_ch_switch(iface->bss[0], freq, ht,
+ hostapd_event_ch_switch(wpa_s->ap_iface->bss[0], freq, ht,
offset, width, cf1, cf2);
}
@@ -1592,14 +1582,10 @@
void wpas_ap_event_dfs_radar_detected(struct wpa_supplicant *wpa_s,
struct dfs_event *radar)
{
- struct hostapd_iface *iface = wpa_s->ap_iface;
-
- if (!iface)
- iface = wpa_s->ifmsh;
- if (!iface || !iface->bss[0])
+ if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
return;
wpa_printf(MSG_DEBUG, "DFS radar detected on %d MHz", radar->freq);
- hostapd_dfs_radar_detected(iface, radar->freq,
+ hostapd_dfs_radar_detected(wpa_s->ap_iface, radar->freq,
radar->ht_enabled, radar->chan_offset,
radar->chan_width,
radar->cf1, radar->cf2);
@@ -1609,14 +1595,10 @@
void wpas_ap_event_dfs_cac_started(struct wpa_supplicant *wpa_s,
struct dfs_event *radar)
{
- struct hostapd_iface *iface = wpa_s->ap_iface;
-
- if (!iface)
- iface = wpa_s->ifmsh;
- if (!iface || !iface->bss[0])
+ if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
return;
wpa_printf(MSG_DEBUG, "DFS CAC started on %d MHz", radar->freq);
- hostapd_dfs_start_cac(iface, radar->freq,
+ hostapd_dfs_start_cac(wpa_s->ap_iface, radar->freq,
radar->ht_enabled, radar->chan_offset,
radar->chan_width, radar->cf1, radar->cf2);
}
@@ -1625,14 +1607,10 @@
void wpas_ap_event_dfs_cac_finished(struct wpa_supplicant *wpa_s,
struct dfs_event *radar)
{
- struct hostapd_iface *iface = wpa_s->ap_iface;
-
- if (!iface)
- iface = wpa_s->ifmsh;
- if (!iface || !iface->bss[0])
+ if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
return;
wpa_printf(MSG_DEBUG, "DFS CAC finished on %d MHz", radar->freq);
- hostapd_dfs_complete_cac(iface, 1, radar->freq,
+ hostapd_dfs_complete_cac(wpa_s->ap_iface, 1, radar->freq,
radar->ht_enabled, radar->chan_offset,
radar->chan_width, radar->cf1, radar->cf2);
}
@@ -1641,14 +1619,10 @@
void wpas_ap_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s,
struct dfs_event *radar)
{
- struct hostapd_iface *iface = wpa_s->ap_iface;
-
- if (!iface)
- iface = wpa_s->ifmsh;
- if (!iface || !iface->bss[0])
+ if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
return;
wpa_printf(MSG_DEBUG, "DFS CAC aborted on %d MHz", radar->freq);
- hostapd_dfs_complete_cac(iface, 0, radar->freq,
+ hostapd_dfs_complete_cac(wpa_s->ap_iface, 0, radar->freq,
radar->ht_enabled, radar->chan_offset,
radar->chan_width, radar->cf1, radar->cf2);
}
@@ -1657,14 +1631,10 @@
void wpas_ap_event_dfs_cac_nop_finished(struct wpa_supplicant *wpa_s,
struct dfs_event *radar)
{
- struct hostapd_iface *iface = wpa_s->ap_iface;
-
- if (!iface)
- iface = wpa_s->ifmsh;
- if (!iface || !iface->bss[0])
+ if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
return;
wpa_printf(MSG_DEBUG, "DFS NOP finished on %d MHz", radar->freq);
- hostapd_dfs_nop_finished(iface, radar->freq,
+ hostapd_dfs_nop_finished(wpa_s->ap_iface, radar->freq,
radar->ht_enabled, radar->chan_offset,
radar->chan_width, radar->cf1, radar->cf2);
}