diff options
| author | Eyal Shapira <eyal@wizery.com> | 2012-10-28 20:29:14 +0200 |
|---|---|---|
| committer | Eyal Shapira <eyal@wizery.com> | 2012-10-29 11:14:08 +0200 |
| commit | e62ecda1b94b2b07dfce877654b10c6ff8c46857 (patch) | |
| tree | 5cf28eeffeed93d013c6e654be7e4d8e568bb37a /wpa_supplicant | |
| parent | 25dec55e99994c197167d5db10d0efc0b04e707d (diff) | |
| download | external_wpa_supplicant_8_ti-e62ecda1b94b2b07dfce877654b10c6ff8c46857.zip external_wpa_supplicant_8_ti-e62ecda1b94b2b07dfce877654b10c6ff8c46857.tar.gz external_wpa_supplicant_8_ti-e62ecda1b94b2b07dfce877654b10c6ff8c46857.tar.bz2 | |
Revert "Add P2P IEs to probe requests only when in P2P (UPSTREAM)"
This is replaced by a recent patch by Jouni in the upstream:
"P2P: Allow P2P functionality to be disabled per interface"
This reverts commit a56f6df6f8e5dcd650893e8beb4a16a633c179d1.
Conflicts:
src/p2p/p2p.c
Diffstat (limited to 'wpa_supplicant')
| -rw-r--r-- | wpa_supplicant/p2p_supplicant.c | 7 | ||||
| -rw-r--r-- | wpa_supplicant/p2p_supplicant.h | 1 | ||||
| -rw-r--r-- | wpa_supplicant/scan.c | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index b0eb594..ae23632 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -4973,13 +4973,6 @@ int wpas_p2p_in_progress(struct wpa_supplicant *wpa_s) return p2p_in_progress(wpa_s->global->p2p); } -int wpas_p2p_non_idle(struct wpa_supplicant *wpa_s) -{ - if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL) - return 0; - - return p2p_non_idle(wpa_s->global->p2p); -} void wpas_p2p_network_removed(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid) diff --git a/wpa_supplicant/p2p_supplicant.h b/wpa_supplicant/p2p_supplicant.h index f24fb28..8d3bff1 100644 --- a/wpa_supplicant/p2p_supplicant.h +++ b/wpa_supplicant/p2p_supplicant.h @@ -137,7 +137,6 @@ int wpas_p2p_disconnect(struct wpa_supplicant *wpa_s); void wpas_p2p_wps_failed(struct wpa_supplicant *wpa_s, struct wps_event_fail *fail); int wpas_p2p_in_progress(struct wpa_supplicant *wpa_s); -int wpas_p2p_non_idle(struct wpa_supplicant *wpa_s); void wpas_p2p_network_removed(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid); struct wpa_ssid * wpas_p2p_get_persistent(struct wpa_supplicant *wpa_s, diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index 6b43968..2b468fb 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -66,7 +66,7 @@ static int wpas_wps_in_use(struct wpa_supplicant *wpa_s, } #ifdef CONFIG_P2P - if (wpas_p2p_non_idle(wpa_s)) { + if (!wpa_s->global->p2p_disabled && wpa_s->global->p2p) { wpa_s->wps->dev.p2p = 1; if (!wps) { wps = 1; |