X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Fap%2Fbeacon.c;h=17cb541e191e55748658d744c11041680512d856;hb=dce044cce59af4e2c56e4428ae905bc0bff85c60;hp=83c7a2723b8ab7633b11ba0cc6a0000d2439562f;hpb=6c6915f3db5c981234ef4aae9e614ded47a9a81c;p=libeap.git diff --git a/src/ap/beacon.c b/src/ap/beacon.c index 83c7a27..17cb541 100644 --- a/src/ap/beacon.c +++ b/src/ap/beacon.c @@ -30,6 +30,7 @@ #include "wmm.h" #include "ap_config.h" #include "sta_info.h" +#include "p2p_hostapd.h" #include "beacon.h" @@ -195,30 +196,6 @@ static u8 * hostapd_eid_wpa(struct hostapd_data *hapd, u8 *eid, size_t len, } -#ifdef CONFIG_P2P_MANAGER -u8 * hostapd_eid_p2p_manage(struct hostapd_data *hapd, u8 *eid) -{ - u8 bitmap; - *eid++ = WLAN_EID_VENDOR_SPECIFIC; - *eid++ = 4 + 3 + 1; - WPA_PUT_BE24(eid, OUI_WFA); - eid += 3; - *eid++ = P2P_OUI_TYPE; - - *eid++ = P2P_ATTR_MANAGEABILITY; - WPA_PUT_LE16(eid, 1); - eid += 2; - bitmap = P2P_MAN_DEVICE_MANAGEMENT; - if (hapd->conf->p2p & P2P_ALLOW_CROSS_CONNECTION) - bitmap |= P2P_MAN_CROSS_CONNECTION_PERMITTED; - bitmap |= P2P_MAN_COEXISTENCE_OPTIONAL; - *eid++ = bitmap; - - return eid; -} -#endif /* CONFIG_P2P_MANAGER */ - - void handle_probe_req(struct hostapd_data *hapd, const struct ieee80211_mgmt *mgmt, size_t len) {