diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2012-09-25 14:23:53 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2012-09-25 14:25:52 -0700 |
| commit | 91c40cdce17424d9a4718876becf0b7811cf68f2 (patch) | |
| tree | 6c5488e5b026cda1c3bc78227a6c39136fc6b89a /wpa_supplicant | |
| parent | aa532510a7b8c4da2d7d6e2c11dda5db840894e4 (diff) | |
| download | external_wpa_supplicant_8-91c40cdce17424d9a4718876becf0b7811cf68f2.zip external_wpa_supplicant_8-91c40cdce17424d9a4718876becf0b7811cf68f2.tar.gz external_wpa_supplicant_8-91c40cdce17424d9a4718876becf0b7811cf68f2.tar.bz2 | |
wpa_supplicant: P2P-related fixes
- P2P: Show own channel list in debug log
- P2P: Allow peer to propose channel in invitation process
- P2P: Clear sta_scan_pending on group removal
- P2P: Fix ignoring of PD Response due to dialog token mismatch
BUG: 7226065, 7231289
Change-Id: Iacb0f85d80f63bcdf311ccc0d29d0c282a0c0576
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'wpa_supplicant')
| -rw-r--r-- | wpa_supplicant/p2p_supplicant.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index cf8f935..c721a29 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -377,6 +377,7 @@ static int wpas_p2p_group_delete(struct wpa_supplicant *wpa_s, wpa_config_remove_network(wpa_s->conf, id); wpa_supplicant_clear_status(wpa_s); wpa_supplicant_cancel_sched_scan(wpa_s); + wpa_s->sta_scan_pending = 0; } else { wpa_printf(MSG_DEBUG, "P2P: Temporary group network not " "found"); @@ -2322,8 +2323,9 @@ static void wpas_invitation_received(void *ctx, const u8 *sa, const u8 *bssid, " was accepted; op_freq=%d MHz", MAC2STR(sa), op_freq); if (s) { + int go = s->mode == WPAS_MODE_P2P_GO; wpas_p2p_group_add_persistent( - wpa_s, s, s->mode == WPAS_MODE_P2P_GO, 0, 0); + wpa_s, s, go, go ? op_freq : 0, 0); } else if (bssid) { wpas_p2p_join(wpa_s, bssid, go_dev_addr, wpa_s->p2p_wps_method, 0); |