|
@@ -721,7 +721,7 @@ static void wpas_send_action_done(void *ctx)
|
|
|
wpa_printf(MSG_DEBUG, "P2P: Action frame sequence done notification");
|
|
|
wpabuf_free(wpa_s->pending_action_tx);
|
|
|
wpa_s->pending_action_tx = NULL;
|
|
|
- if (wpa_s->off_channel_freq) {
|
|
|
+ if (wpa_s->off_channel_freq || wpa_s->roc_waiting_drv_freq) {
|
|
|
wpa_drv_cancel_remain_on_channel(wpa_s);
|
|
|
wpa_s->off_channel_freq = 0;
|
|
|
wpa_s->roc_waiting_drv_freq = 0;
|
|
@@ -995,7 +995,7 @@ void wpas_go_neg_completed(void *ctx, struct p2p_go_neg_results *res)
|
|
|
{
|
|
|
struct wpa_supplicant *wpa_s = ctx;
|
|
|
|
|
|
- if (wpa_s->off_channel_freq) {
|
|
|
+ if (wpa_s->off_channel_freq || wpa_s->roc_waiting_drv_freq) {
|
|
|
wpa_drv_cancel_remain_on_channel(wpa_s);
|
|
|
wpa_s->off_channel_freq = 0;
|
|
|
wpa_s->roc_waiting_drv_freq = 0;
|