From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Thu, 8 Sep 2011 17:52:23 +0000 (+0300)
Subject: nl80211: Register GAS frames for Interworking
X-Git-Tag: hostap-1-bp~147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fe9fa0d2928430eda09cc8aad86c60898393d45;p=thirdparty%2Fhostap.git

nl80211: Register GAS frames for Interworking

The GAS frames are used both with P2P and Interworking, so register
them if CONFIG_INTERWORKING is used without CONFIG_P2P.
---

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 37d72a09b..f754a46e7 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -2273,7 +2273,7 @@ static int nl80211_register_action_frame(struct wpa_driver_nl80211_data *drv,
 
 static int nl80211_register_action_frames(struct wpa_driver_nl80211_data *drv)
 {
-#ifdef CONFIG_P2P
+#if defined(CONFIG_P2P) || defined(CONFIG_INTERWORKING)
 	/* GAS Initial Request */
 	if (nl80211_register_action_frame(drv, (u8 *) "\x04\x0a", 2) < 0)
 		return -1;
@@ -2286,6 +2286,8 @@ static int nl80211_register_action_frames(struct wpa_driver_nl80211_data *drv)
 	/* GAS Comeback Response */
 	if (nl80211_register_action_frame(drv, (u8 *) "\x04\x0d", 2) < 0)
 		return -1;
+#endif /* CONFIG_P2P || CONFIG_INTERWORKING */
+#ifdef CONFIG_P2P
 	/* P2P Public Action */
 	if (nl80211_register_action_frame(drv,
 					  (u8 *) "\x04\x09\x50\x6f\x9a\x09",