From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Mon, 17 Oct 2011 15:39:31 +0000 (+0300)
Subject: Remove unused P2P device discovery hack from Beacon configuration
X-Git-Tag: hostap-1-bp~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ce0f8b31b62ab6d3074d3db7a931db45198acfb;p=thirdparty%2Fhostap.git

Remove unused P2P device discovery hack from Beacon configuration

AP mode operations were used for P2P device discovery Listen state
only during early experiments. This has now been cleaned up and
ieee802_11_set_beacon() is not called for P2P device discovery.
As such, this hack to skip Beacon configuration can be removed.
---

diff --git a/src/ap/beacon.c b/src/ap/beacon.c
index b2f321833..c0fa6394d 100644
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
@@ -519,10 +519,6 @@ void ieee802_11_set_beacon(struct hostapd_data *hapd)
 	u8 *pos, *tailpos;
 #endif /* NEED_AP_MLME */
 
-#ifdef CONFIG_P2P
-	if ((hapd->conf->p2p & (P2P_ENABLED | P2P_GROUP_OWNER)) == P2P_ENABLED)
-		goto no_beacon;
-#endif /* CONFIG_P2P */
 	hapd->beacon_set_done = 1;
 
 #ifdef NEED_AP_MLME
@@ -677,9 +673,6 @@ void ieee802_11_set_beacon(struct hostapd_data *hapd)
 	os_free(tail);
 	os_free(head);
 
-#ifdef CONFIG_P2P
-no_beacon:
-#endif /* CONFIG_P2P */
 #ifdef NEED_AP_MLME
 	hostapd_set_bss_params(hapd, !!(ieee802_11_erp_info(hapd) &
 					ERP_INFO_USE_PROTECTION));