Merge branch 'bugfix/dpp_roc_loop_error' into 'master'

kapilkedawat · kapilkedawat · commit f82bcd2a654f · 2025-09-14T22:52:56.000+05:30
fix(esp_wifi): Correctly set roc_in_progress flag

Closes WIFI-7013

See merge request espressif/esp-idf!41722
diff --git a/components/wpa_supplicant/esp_supplicant/src/esp_dpp.c b/components/wpa_supplicant/esp_supplicant/src/esp_dpp.c
@@ -651,6 +651,7 @@ static void dpp_listen_next_channel(void *data, void *user_ctx)
         wpa_printf(MSG_ERROR, "Failed ROC. error : 0x%x", ret);
         return;
     }
+    atomic_store(&roc_in_progress, true);
     os_event_group_clear_bits(s_dpp_event_group, DPP_ROC_EVENT_HANDLED);
 }
 
@@ -823,7 +824,6 @@ static void tx_status_handler(void *arg, esp_event_base_t event_base,
             eloop_register_timeout(ESP_GAS_TIMEOUT_SECS, 0, gas_query_timeout, NULL, auth);
         }
     }
-    atomic_store(&roc_in_progress, true);
 }
 
 static void roc_status_handler(void *arg, esp_event_base_t event_base,

Original file line number	Diff line number	Diff line change
`@@ -651,6 +651,7 @@ static void dpp_listen_next_channel(void data, void user_ctx)`
`651`	`651`	`wpa_printf(MSG_ERROR, "Failed ROC. error : 0x%x", ret);`
`652`	`652`	`return;`
`653`	`653`	`}`
	`654`	`+ atomic_store(&roc_in_progress, true);`
`654`	`655`	`os_event_group_clear_bits(s_dpp_event_group, DPP_ROC_EVENT_HANDLED);`
`655`	`656`	`}`
`656`	`657`
`@@ -823,7 +824,6 @@ static void tx_status_handler(void *arg, esp_event_base_t event_base,`
`823`	`824`	`eloop_register_timeout(ESP_GAS_TIMEOUT_SECS, 0, gas_query_timeout, NULL, auth);`
`824`	`825`	`}`
`825`	`826`	`}`
`826`		`- atomic_store(&roc_in_progress, true);`
`827`	`827`	`}`
`828`	`828`
`829`	`829`	`static void roc_status_handler(void *arg, esp_event_base_t event_base,`