FROMLIST: BACKPORT: Use default IEs in wpa_supplicant_trigger_scan
wpa_supplicant_trigger_scan previously wouldn't include any of the IEs
generated by wpa_supplicant_extra_ies. Instruct it to do so in most
cases. This is necessary because MBO STAs are required to include MBO
capabilities in their probe requests.
Conflicts:
--- a/wpa_supplicant/scan.h
+++ b/wpa_supplicant/scan.h
@@@ -86,5 -87,10 +87,13 @@@ unsigned int wpas_get_est_tpt(const str
const u8 *ies, size_t ies_len, int rate,
int snr);
void wpa_supplicant_set_default_scan_ies(struct wpa_supplicant *wpa_s);
++<<<<<<< HEAD
++=======
+ int wpa_add_scan_freqs_list(struct wpa_supplicant *wpa_s,
+ enum hostapd_hw_mode band,
+ struct wpa_driver_scan_params *params,
+ bool is_6ghz);
+ struct wpabuf * wpa_supplicant_extra_ies(struct wpa_supplicant *wpa_s);
++>>>>>>> Use default IEs in wpa_supplicant_trigger_scan
BUG=b:180664130
TEST=Look at pcap
TEST=all hwsim tests
(am from http://patchwork.ozlabs.org/patch/1460677)
Signed-off-by: Matthew Wang <matthewmwang@chromium.org>
Change-Id: I56af87aed3587226349a364de96dc15582eb578c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/hostap/+/2793046
Reviewed-by: Brian Norris <briannorris@chromium.org>
8 files changed