Revert "Cumulative patch from commit 4ec1fd8e42bad9390f14a58225b6e5f6fb691950"
This reverts commit 78a5dac804c22aa6e4ec8226a864d3b0d6ccddbb.
Test: None
diff --git a/wpa_supplicant/interworking.c b/wpa_supplicant/interworking.c
index 1fb40c7..697810e 100644
--- a/wpa_supplicant/interworking.c
+++ b/wpa_supplicant/interworking.c
@@ -2692,11 +2692,10 @@
int anqp_send_req(struct wpa_supplicant *wpa_s, const u8 *dst,
- u16 info_ids[], size_t num_ids, u32 subtypes,
- int get_cell_pref)
+ u16 info_ids[], size_t num_ids, u32 subtypes)
{
struct wpabuf *buf;
- struct wpabuf *extra_buf = NULL;
+ struct wpabuf *hs20_buf = NULL;
int ret = 0;
int freq;
struct wpa_bss *bss;
@@ -2719,31 +2718,15 @@
#ifdef CONFIG_HS20
if (subtypes != 0) {
- extra_buf = wpabuf_alloc(100);
- if (extra_buf == NULL)
+ hs20_buf = wpabuf_alloc(100);
+ if (hs20_buf == NULL)
return -1;
- hs20_put_anqp_req(subtypes, NULL, 0, extra_buf);
+ hs20_put_anqp_req(subtypes, NULL, 0, hs20_buf);
}
#endif /* CONFIG_HS20 */
-#ifdef CONFIG_MBO
- if (get_cell_pref) {
- struct wpabuf *mbo;
-
- mbo = mbo_build_anqp_buf(wpa_s, bss);
- if (mbo) {
- if (wpabuf_resize(&extra_buf, wpabuf_len(mbo))) {
- wpabuf_free(extra_buf);
- return -1;
- }
- wpabuf_put_buf(extra_buf, mbo);
- wpabuf_free(mbo);
- }
- }
-#endif /* CONFIG_MBO */
-
- buf = anqp_build_req(info_ids, num_ids, extra_buf);
- wpabuf_free(extra_buf);
+ buf = anqp_build_req(info_ids, num_ids, hs20_buf);
+ wpabuf_free(hs20_buf);
if (buf == NULL)
return -1;