Cumulative patch from commit 147848ec4d26613d5a117d4b35dbc7ff98dd65d1

147848e nl80211: Do not add all virtual interfaces to drv->if_indices
de88430 nl80211: Fix del_ifidx() with mixed parent interface cases
829a1b3 P2P: Clear p2p_auth_invite after each persistent group invitation
e403ba8 Parse DMG capabilities when reporting to external interfaces
f7454c9 P2P: Add 60 GHz in channel to frequency conversion
fc3f1d1 Remove unused hostapd_ip_diff()
7bb7090 Add DRIVER_EVENT AVOID_FREQUENCIES for testing
d73c7b9 GAS: Send error response if no room for pending dialog context
658d495 HS 2.0: Include OSU client sample in wpa_supplicant release package

Change-Id: Ie2109f25bd8de2c926d4116eed37b458ae6a6950
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
diff --git a/src/ap/gas_serv.c b/src/ap/gas_serv.c
index 49f6e87..b406880 100644
--- a/src/ap/gas_serv.c
+++ b/src/ap/gas_serv.c
@@ -989,14 +989,17 @@
 				   "for " MACSTR " (dialog token %u)",
 				   MAC2STR(sa), dialog_token);
 			wpabuf_free(buf);
-			return;
+			tx_buf = gas_anqp_build_initial_resp_buf(
+				dialog_token, WLAN_STATUS_UNSPECIFIED_FAILURE,
+				0, NULL);
+		} else {
+			di->prot = prot;
+			di->sd_resp = buf;
+			di->sd_resp_pos = 0;
+			tx_buf = gas_anqp_build_initial_resp_buf(
+				dialog_token, WLAN_STATUS_SUCCESS,
+				comeback_delay, NULL);
 		}
-		di->prot = prot;
-		di->sd_resp = buf;
-		di->sd_resp_pos = 0;
-		tx_buf = gas_anqp_build_initial_resp_buf(
-			dialog_token, WLAN_STATUS_SUCCESS, comeback_delay,
-			NULL);
 	} else {
 		wpa_printf(MSG_DEBUG, "ANQP: Initial response (no comeback)");
 		tx_buf = gas_anqp_build_initial_resp_buf(