diff options
| author | Vishal Mahaveer <vishalm@ti.com> | 2012-12-11 10:28:54 -0600 |
|---|---|---|
| committer | Vishal Mahaveer <vishalm@ti.com> | 2012-12-11 10:28:54 -0600 |
| commit | 68bd90b2df35d0854416f4f8bb79c5fc073237fa (patch) | |
| tree | d9f566e78fcb1efd93740a0cdc7dc7bbd01fe713 /src/p2p/p2p_go_neg.c | |
| parent | 0613a964c52b31d6763fd30dd45521314f3a2429 (diff) | |
| parent | 4e1835b2ccb4698e8e7022522928317d219bca32 (diff) | |
| download | external_wpa_supplicant_8_ti-68bd90b2df35d0854416f4f8bb79c5fc073237fa.zip external_wpa_supplicant_8_ti-68bd90b2df35d0854416f4f8bb79c5fc073237fa.tar.gz external_wpa_supplicant_8_ti-68bd90b2df35d0854416f4f8bb79c5fc073237fa.tar.bz2 | |
Merge commit 'ol_r8.a5.06' into p-jb-mr1-release
Conflicts:
wpa_supplicant/wpa_supplicant_template.conf
Change-Id: Ifb38077650e8bb6075a17b8f2232f14b704281f1
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
Diffstat (limited to 'src/p2p/p2p_go_neg.c')
| -rw-r--r-- | src/p2p/p2p_go_neg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/p2p/p2p_go_neg.c b/src/p2p/p2p_go_neg.c index 2d31f4b..60c19c6 100644 --- a/src/p2p/p2p_go_neg.c +++ b/src/p2p/p2p_go_neg.c @@ -827,6 +827,7 @@ void p2p_process_go_neg_resp(struct p2p_data *p2p, const u8 *sa, return; } dev->flags &= ~P2P_DEV_WAIT_GO_NEG_RESPONSE; + p2p->cfg->send_action_done(p2p->cfg->cb_ctx); if (msg.dialog_token != dev->dialog_token) { wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, @@ -860,7 +861,6 @@ void p2p_process_go_neg_resp(struct p2p_data *p2p, const u8 *sa, "P2P: Stop GO Negotiation attempt"); p2p_go_neg_failed(p2p, dev, *msg.status); } - p2p->cfg->send_action_done(p2p->cfg->cb_ctx); p2p_parse_free(&msg); return; } @@ -1097,6 +1097,7 @@ void p2p_process_go_neg_conf(struct p2p_data *p2p, const u8 *sa, wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Received GO Negotiation Confirm from " MACSTR, MAC2STR(sa)); + p2p->cfg->send_action_done(p2p->cfg->cb_ctx); dev = p2p_get_device(p2p, sa); if (dev == NULL || dev->wps_method == WPS_NOT_READY || dev != p2p->go_neg_peer) { |