From c2ebb4b85d69b65f552fee71ac68f44e8d87b39e Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Wed, 24 Jul 2013 12:57:51 -0700 Subject: Accumulative patch from commit 932659696e2755bb1ecd6a27e1968fd27eef4948 9326596 nl80211: Remove unused WPA_DRIVER_FLAGS_MULTI_CHANNEL_CONCURRENT 0d08efa P2P: Use the number of concurrent channels in P2P flows a21816a Use wpa_drv_shared_freq() if get_radio_name() is not supported 53c5dfc Change share_vif_oper_freq() to handle multiple freqs 4752147 nl80211: Report the number of concurrent support channels d7df0fa Clean up wpa_supplicant_event() with deauth/disassoc helper functions fd9f170 Remove unnecessary nested ifdef CONFIG_AP 13adc57 IBSS RSN: Add peer restart detection b21990b nl80211: Register for AUTH frames when joining an IBSS network c91f796 nl80211: Support not specifying the frame frequency ec384c5 IBSS RSN: Fix disconnect() with internal SME ed07764 nl80211: Remove redundant assignment of ifindex 4ed8d95 TDLS: Tear down TDLS using wpas_drv_tlds_oper() if not external 831770b Cancel delayed scheduled scan when wpa_supplicant cleans up 69dd296 WDS: Fix WEP usage with nl80211 wds_sta=1 c8ebeda wpa_supplicant: Add support for VHT BSS membership selector 3f9a813 hostapd: Add a config option to control beaconing 182b2e5 Add missing host_to_le32() for big endian hosts 3f53c00 nl80211: Ignore disconnect event in case of locally generated request Change-Id: Ia7368e71ae40966a92970ac82b002c09a7971d41 Signed-off-by: Dmitry Shmidt --- src/p2p/p2p.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/p2p/p2p.h') diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h index c392d571..6b5679c8 100644 --- a/src/p2p/p2p.h +++ b/src/p2p/p2p.h @@ -375,14 +375,6 @@ struct p2p_config { */ unsigned int max_listen; -#ifdef ANDROID_P2P - enum p2p_concurrency_type { - P2P_NON_CONCURRENT, - P2P_SINGLE_CHANNEL_CONCURRENT, - P2P_MULTI_CHANNEL_CONCURRENT, - } p2p_concurrency; -#endif - /** * cb_ctx - Context to use with callback functions */ -- cgit v1.2.3