Browse Source

P2P: Cancel group formation on PBC overlap

We should cancel group formation completely on PBC overlap instead
of just partially notifying that operations were stopped. There is
no point in waiting for the group formation timeout in this case.
Sudhakar Swaminathan 14 years ago
parent
commit
0a14e3ec8b
1 changed files with 7 additions and 0 deletions
  1. 7 0
      wpa_supplicant/p2p_supplicant.c

+ 7 - 0
wpa_supplicant/p2p_supplicant.c

@@ -3914,6 +3914,13 @@ int wpas_p2p_notif_pbc_overlap(struct wpa_supplicant *wpa_s)
 		   "session overlap");
 	if (wpa_s != wpa_s->parent)
 		wpa_msg_ctrl(wpa_s->parent, MSG_INFO, WPS_EVENT_OVERLAP);
+
+	if (wpa_s->global->p2p)
+		p2p_group_formation_failed(wpa_s->global->p2p);
+
+	eloop_cancel_timeout(wpas_p2p_group_formation_timeout,
+			     wpa_s->parent, NULL);
+
 	wpas_group_formation_completed(wpa_s, 0);
 	return 1;
 }