[NXP] Fix TC-CNET-4.9 and add wifi reconnection in revert configuration (#41743)

* [NXP] Fix TC-CNET-4.9 and add wifi reconnection in revert configuration

Signed-off-by: Martin Girardot <[email protected]>

* Restyled by clang-format

* [NXP] Fix PR comments

Signed-off-by: Martin Girardot <[email protected]>

* Restyled by clang-format

* [NXP] Fix PR comments

Signed-off-by: Martin Girardot <[email protected]>

---------

Signed-off-by: Martin Girardot <[email protected]>
Co-authored-by: Restyled.io <[email protected]>

Author: Martin-NXP

src/platform/nxp/common/NetworkCommissioningWiFiDriver.cpp

@@ -129,18 +129,27 @@ CHIP_ERROR NXPWiFiDriver::RevertConfiguration()
 {
     struct wlan_network searchedNetwork = { 0 };
 
-    /* If network was added we have to remove it (as the connection failed) from wifi driver to be able
-    to connect to another network next commissioning */
-    if (wlan_get_network_byname(mStagingNetwork.ssid, &searchedNetwork) == WM_SUCCESS)
+    /* If network was added we have to remove it (only if device is not connected to a wifi network) from wifi driver to be able
+    to connect to another network next commissioning.
+    Do not remove the network if the device is already connected to a WiFi network,
+    example scenario: TC-CNET-4.9
+    */
+    if (!is_sta_connected() && wlan_get_network_byname(mStagingNetwork.ssid, &searchedNetwork) == WM_SUCCESS)
     {
         if (wlan_remove_network(mStagingNetwork.ssid) != WM_SUCCESS)
         {
             return CHIP_ERROR_INTERNAL;
         }
     }
+
+    /* Reset mStagingNetwork as it may have been updated during add/update network operation */
     mStagingNetwork = mSavedNetwork;
 
-    return CHIP_NO_ERROR;
+    // succeed right away if no saved network
+    VerifyOrReturnError(mStagingNetwork.ssidLen > 0, CHIP_NO_ERROR);
+    // Connect to saved network
+    return ConnectWiFiNetwork(mStagingNetwork.ssid, mStagingNetwork.ssidLen, mStagingNetwork.credentials,
+                              mStagingNetwork.credentialsLen);
 }
 
 bool NXPWiFiDriver::NetworkMatch(const WiFiNetwork & network, ByteSpan networkId)