Merge pull request #237 from pennam/wifi-begin-fix

pennam · web-flow · commit 8cbd9cf0e60a · 2025-10-30T14:12:32.000+01:00
wifi: fix race condition waiting for connect result
diff --git a/libraries/WiFi/src/WiFi.cpp b/libraries/WiFi/src/WiFi.cpp
@@ -28,11 +28,13 @@ int WiFiClass::begin(const char *ssid, const char *passphrase, wl_enc_type secur
 	if (ret) {
 		return false;
 	}
-	NetworkInterface::begin(false, NET_EVENT_WIFI_MASK);
-	if (blocking) {
+
+	ret = status();
+	if (ret != WL_CONNECTED && blocking) {
 		net_mgmt_event_wait_on_iface(sta_iface, NET_EVENT_WIFI_CONNECT_RESULT, NULL, NULL, NULL,
 									 K_FOREVER);
 	}
+	NetworkInterface::begin(blocking, NET_EVENT_WIFI_MASK);
 	return status();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,13 @@ int WiFiClass::begin(const char ssid, const char passphrase, wl_enc_type secur`
`28`	`28`	`if (ret) {`
`29`	`29`	`return false;`
`30`	`30`	`}`
`31`		`- NetworkInterface::begin(false, NET_EVENT_WIFI_MASK);`
`32`		`- if (blocking) {`
	`31`	`+`
	`32`	`+ ret = status();`
	`33`	`+ if (ret != WL_CONNECTED && blocking) {`
`33`	`34`	`net_mgmt_event_wait_on_iface(sta_iface, NET_EVENT_WIFI_CONNECT_RESULT, NULL, NULL, NULL,`
`34`	`35`	`K_FOREVER);`
`35`	`36`	`}`
	`37`	`+ NetworkInterface::begin(blocking, NET_EVENT_WIFI_MASK);`
`36`	`38`	`return status();`
`37`	`39`	`}`
`38`	`40`