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 /src | |
| 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 'src')
| -rw-r--r-- | src/p2p/p2p.c | 8 | ||||
| -rw-r--r-- | src/p2p/p2p.h | 10 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index e905e77..824a59e 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -4102,14 +4102,6 @@ int p2p_in_progress(struct p2p_data *p2p) 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 3f796d0..3c439f3 100644 --- a/src/p2p/p2p.h +++ b/src/p2p/p2p.h @@ -1690,16 +1690,6 @@ int p2p_set_pref_chan(struct p2p_data *p2p, unsigned int num_pref_chan, */ 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 |