jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix build without CONFIG_P2P=y

Browse source
This commit is contained in:
Jouni Malinen 2010-09-09 07:20:28 -07:00 committed by Jouni Malinen
parent e9a7ae41fa
commit 812bf56ab1
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ap/p2p_hostapd.h
View file

@ -27,7 +27,8 @@ void hostapd_p2p_non_p2p_sta_disconnected(struct hostapd_data *hapd);
#else /* CONFIG_P2P */ #else /* CONFIG_P2P */
int hostapd_p2p_get_mib_sta(struct hostapd_data *hapd, struct sta_info *sta, static inline int hostapd_p2p_get_mib_sta(struct hostapd_data *hapd,
struct sta_info *sta,
char *buf, size_t buflen) char *buf, size_t buflen)
{ {
return 0; return 0;

1
wpa_supplicant/p2p_supplicant.h
View file

@ -16,6 +16,7 @@
#define P2P_SUPPLICANT_H #define P2P_SUPPLICANT_H
enum p2p_wps_method; enum p2p_wps_method;
struct p2p_go_neg_results;
int wpas_p2p_init(struct wpa_global *global, struct wpa_supplicant *wpa_s); int wpas_p2p_init(struct wpa_global *global, struct wpa_supplicant *wpa_s);
void wpas_p2p_deinit(struct wpa_supplicant *wpa_s); void wpas_p2p_deinit(struct wpa_supplicant *wpa_s);

4
wpa_supplicant/wps_supplicant.c
View file

@ -692,6 +692,7 @@ int wpas_wps_start_pbc(struct wpa_supplicant *wpa_s, const u8 *bssid,
return -1; return -1;
ssid->temporary = 1; ssid->temporary = 1;
ssid->p2p_group = p2p_group; ssid->p2p_group = p2p_group;
#ifdef CONFIG_P2P
if (p2p_group && wpa_s->go_params && wpa_s->go_params->ssid_len) { if (p2p_group && wpa_s->go_params && wpa_s->go_params->ssid_len) {
ssid->ssid = os_zalloc(wpa_s->go_params->ssid_len + 1); ssid->ssid = os_zalloc(wpa_s->go_params->ssid_len + 1);
if (ssid->ssid) { if (ssid->ssid) {
@ -702,6 +703,7 @@ int wpas_wps_start_pbc(struct wpa_supplicant *wpa_s, const u8 *bssid,
"SSID", ssid->ssid, ssid->ssid_len); "SSID", ssid->ssid, ssid->ssid_len);
} }
} }
#endif /* CONFIG_P2P */
wpa_config_set(ssid, "phase1", "\"pbc=1\"", 0); wpa_config_set(ssid, "phase1", "\"pbc=1\"", 0);
if (wpa_s->wps_fragment_size) if (wpa_s->wps_fragment_size)
ssid->eap.fragment_size = wpa_s->wps_fragment_size; ssid->eap.fragment_size = wpa_s->wps_fragment_size;
@ -725,6 +727,7 @@ int wpas_wps_start_pin(struct wpa_supplicant *wpa_s, const u8 *bssid,
return -1; return -1;
ssid->temporary = 1; ssid->temporary = 1;
ssid->p2p_group = p2p_group; ssid->p2p_group = p2p_group;
#ifdef CONFIG_P2P
if (p2p_group && wpa_s->go_params && wpa_s->go_params->ssid_len) { if (p2p_group && wpa_s->go_params && wpa_s->go_params->ssid_len) {
ssid->ssid = os_zalloc(wpa_s->go_params->ssid_len + 1); ssid->ssid = os_zalloc(wpa_s->go_params->ssid_len + 1);
if (ssid->ssid) { if (ssid->ssid) {
@ -735,6 +738,7 @@ int wpas_wps_start_pin(struct wpa_supplicant *wpa_s, const u8 *bssid,
"SSID", ssid->ssid, ssid->ssid_len); "SSID", ssid->ssid, ssid->ssid_len);
} }
} }
#endif /* CONFIG_P2P */
if (pin) if (pin)
os_snprintf(val, sizeof(val), "\"pin=%s dev_pw_id=%u\"", os_snprintf(val, sizeof(val), "\"pin=%s dev_pw_id=%u\"",
pin, dev_pw_id); pin, dev_pw_id);