diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2013-09-03 12:16:28 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2013-09-03 12:16:28 -0700 |
| commit | 391c59f0632df8db1c325da1d31d479b2eedce45 (patch) | |
| tree | 9db3520b4cbbab29da1b0e4f9247e49d9c083b87 /src/p2p | |
| parent | 92c368d56f46a4e648b441085707c1381b5e5f63 (diff) | |
| download | android_external_wpa_supplicant_8-391c59f0632df8db1c325da1d31d479b2eedce45.tar.gz android_external_wpa_supplicant_8-391c59f0632df8db1c325da1d31d479b2eedce45.tar.bz2 android_external_wpa_supplicant_8-391c59f0632df8db1c325da1d31d479b2eedce45.zip | |
Cumulative patch from commit b2b688d18d40cd667d0faa149b4a7172166b3bd4
b2b688d P2P: Fix crash when failed to create GO interface
6197169 WPS NFC: Fix build without CONFIG_AP=y
e1ae5d7 SAE: Fix build without CONFIG_AP=y
813e7b3 P2P: Remove group from timeout on PSK failure
5bf9a6c P2P: Add event messages for possible PSK failures on P2P groups
eac8dab P2P: Document per-client keys and p2p_remove_client
43c693c P2P: Do not store duplicate PSK entries for the same device
f2c5660 P2P: Add a command for removing a client from all groups
01a57fe P2P: Maintain list of per-client PSKs for persistent groups
759fd76 P2P: Select PSK based on Device Address instead of Interface Address
94ddef3 P2P: Make peer's P2P Device Address available to authenticator
52177fb P2P: Store P2P Device Address in per-device PSK records
05766ed P2P: Allow per-device PSK to be assigned
698e921 wpa_cli: Add tab completion for p2p_set field values
0b5fb86 P2P: Stop listen state when listen-only duration is over
02a3e5c wpa_cli: Allow first DISCONNECTED event to be reported
cdf8bfa Disallow WEP configuration in WPA network
731ef43 D-Bus: Fix per-iface object unregistration on not existing objects
447969e D-Bus: Do not send network notification for all P2P groups
eb32460 Fix switching from EAP-SIM to EAP-AKA/AKA'
f2b3f4d P2P: Allow P2P functionality to be disabled per interface
50f4f2a hostapd: Add Automatic Channel Selection (ACS) support
43ee470 P2P: Immediate group removal in GC in case of deauthentication
fcf2052 Fix MNC length for Swisscom SIM cards
Bug: 10606228, 10513949
Change-Id: I63ba0e2ab4fa76e6afa7a34be42e8e847e1511b0
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/p2p')
| -rw-r--r-- | src/p2p/p2p.c | 12 | ||||
| -rw-r--r-- | src/p2p/p2p.h | 6 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index b9a754cc..738436c4 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -1188,6 +1188,18 @@ void p2p_stop_listen_for_freq(struct p2p_data *p2p, int freq) } +void p2p_stop_listen(struct p2p_data *p2p) +{ + if (p2p->state != P2P_LISTEN_ONLY) { + p2p_dbg(p2p, "Skip stop_listen since not in listen_only state."); + return; + } + + p2p_stop_listen_for_freq(p2p, 0); + p2p_set_state(p2p, P2P_IDLE); +} + + void p2p_stop_find(struct p2p_data *p2p) { p2p_stop_find_for_freq(p2p, 0); diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h index b206d232..7f845b23 100644 --- a/src/p2p/p2p.h +++ b/src/p2p/p2p.h @@ -904,6 +904,12 @@ void p2p_stop_find_for_freq(struct p2p_data *p2p, int freq); int p2p_listen(struct p2p_data *p2p, unsigned int timeout); /** + * p2p_stop_listen - Stop P2P Listen + * @p2p: P2P module context from p2p_init() + */ +void p2p_stop_listen(struct p2p_data *p2p); + +/** * p2p_connect - Start P2P group formation (GO negotiation) * @p2p: P2P module context from p2p_init() * @peer_addr: MAC address of the peer P2P client |