summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 25dec55)
raw | patch | inline | side by side (parent: 25dec55)
author | Eyal Shapira <eyal@wizery.com> | |
Sun, 28 Oct 2012 18:29:14 +0000 (20:29 +0200) | ||
committer | Eyal Shapira <eyal@wizery.com> | |
Mon, 29 Oct 2012 09:14:08 +0000 (11:14 +0200) |
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
"P2P: Allow P2P functionality to be disabled per interface"
This reverts commit a56f6df6f8e5dcd650893e8beb4a16a633c179d1.
Conflicts:
src/p2p/p2p.c
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
index e905e772057fb284915536def7fe4bb11ffc38d2..824a59edbfedca95c0d0392965ef5120aefa0d72 100644 (file)
--- a/src/p2p/p2p.c
+++ b/src/p2p/p2p.c
return p2p->state != P2P_IDLE && p2p->state != P2P_PROVISIONING;
}
-int p2p_non_idle(struct p2p_data *p2p)
-{
- if (p2p == NULL)
- return 0;
- return p2p->state != P2P_IDLE;
-}
-
-
void p2p_set_config_timeout(struct p2p_data *p2p, u8 go_timeout,
u8 client_timeout)
{
diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h
index 3f796d021dae66eeb12e0e55e5f3b69017bf48a8..3c439f39724f360efec29d6d0e3d234fe5123b32 100644 (file)
--- a/src/p2p/p2p.h
+++ b/src/p2p/p2p.h
*/
int p2p_in_progress(struct p2p_data *p2p);
-/**
- * p2p_non_idle - Check whether P2P is not in P2P_IDLE. That
- * means we're in either search, GO neg or provisioing. Once connected
- * it's back to idle. p2p_in_progress excludes provisioing.
- * @p2p: P2P module context from p2p_init()
- * Returns: 0 if P2P module is idle or 1 if an operation is in progress
- */
-int p2p_non_idle(struct p2p_data *p2p);
-
-
#ifdef ANDROID_P2P
/**
* p2p_search_in_progress - Check whether a P2P SEARCH is in progress
index b0eb594e16b562b98c3d1dd4ec78f3683403606e..ae236326573be80ff3a4da8c129cd8d970d233cd 100644 (file)
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)
index f24fb283168dccd14a7f0a2621e94a5e654ffa28..8d3bff1ff70825c147055c0ac2a26fad7102843a 100644 (file)
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 6b43968c07200a079a99ae7313e8f56386c48990..2b468fbecda05c9acd206c2ed8e8bde3e14b50cc 100644 (file)
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
}
#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;