]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
nl80211: Register GAS frames for Interworking
authorJouni Malinen <jouni@qca.qualcomm.com>
Thu, 8 Sep 2011 17:52:23 +0000 (20:52 +0300)
committerJouni Malinen <j@w1.fi>
Sun, 16 Oct 2011 20:55:34 +0000 (23:55 +0300)
The GAS frames are used both with P2P and Interworking, so register
them if CONFIG_INTERWORKING is used without CONFIG_P2P.

src/drivers/driver_nl80211.c

index 37d72a09b643428d2d4ee611285d2910aa6eaf03..f754a46e79efb041c22d76f8bde51429e2dfcbd2 100644 (file)
@@ -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",