Merge pull request #12580 from cy-arsm/cy-arsm/pr/PR_SoftAP_STA_Fix_revert

Reverting #12312 as it breaking current WiFI connect()->Disconnect() sequence

Author: adbridge

features/lwipstack/LWIPInterface.cpp

@@ -459,42 +459,6 @@ nsapi_error_t LWIP::add_ethernet_interface(EMAC &emac, bool default_if, OnboardN
 #endif //LWIP_ETHERNET
 }
 
-nsapi_error_t LWIP::remove_ethernet_interface(OnboardNetworkStack::Interface **interface_out)
-{
-#if LWIP_ETHERNET
-
-    if ((interface_out != NULL) && (*interface_out != NULL)) {
-
-        Interface *lwip = static_cast<Interface *>(*interface_out);
-        Interface *node = lwip->list;
-
-        if (lwip->list != NULL) {
-            if (lwip->list == lwip) {
-                lwip->list = lwip->list->next;
-                netif_remove(&node->netif);
-                *interface_out = NULL;
-                delete node;
-            } else {
-                while (node->next != NULL && node->next != lwip) {
-                    node = node->next;
-                }
-                if (node->next != NULL && node->next == lwip) {
-                    Interface *remove = node->next;
-                    node->next = node->next->next;
-                    netif_remove(&remove->netif);
-                    *interface_out = NULL;
-                    delete remove;
-                }
-            }
-        }
-    }
-
-    return NSAPI_ERROR_OK;
-#else
-    return NSAPI_ERROR_UNSUPPORTED;
-#endif //LWIP_ETHERNET
-}
-
 nsapi_error_t LWIP::add_l3ip_interface(L3IP &l3ip, bool default_if, OnboardNetworkStack::Interface **interface_out)
 {
 #if LWIP_L3IP

features/lwipstack/LWIPStack.h

@@ -261,14 +261,6 @@ class LWIP : public OnboardNetworkStack, private mbed::NonCopyable<LWIP> {
      */
     nsapi_error_t add_ppp_interface(PPP &ppp, bool default_if, OnboardNetworkStack::Interface **interface_out) override;
 
-    /** Remove a network interface from IP stack
-     *
-     * Removes layer 3 IP objects,network interface from stack list, and shutdown device driver .
-     * @param[out] interface_out    pointer to stack interface object controlling the L3IP
-     * @return                      NSAPI_ERROR_OK on success, or error code
-     */
-    nsapi_error_t remove_ethernet_interface(OnboardNetworkStack::Interface **interface_out) override;
-
     /** Remove a network interface from IP stack
      *
      * Removes PPP objects,network interface from stack list, and shutdown device driver.

features/netsocket/OnboardNetworkStack.h

@@ -149,11 +149,6 @@ class OnboardNetworkStack : public NetworkStack {
         return NSAPI_ERROR_UNSUPPORTED;
     };
 
-    virtual nsapi_error_t remove_ethernet_interface(Interface **interface_out)
-    {
-        return NSAPI_ERROR_OK;
-    };
-
     virtual nsapi_error_t remove_l3ip_interface(Interface **interface_out)
     {
         return NSAPI_ERROR_OK;

features/netsocket/emac-drivers/TARGET_Cypress/COMPONENT_WHD/interface/WhdSTAInterface.cpp

@@ -359,15 +359,6 @@ nsapi_error_t WhdSTAInterface::disconnect()
     }
     whd_emac_wifi_link_state_changed(_whd_emac.ifp, WHD_FALSE);
 
-    // remove the interface added in connect
-    if (_interface) {
-        nsapi_error_t err = _stack.remove_ethernet_interface(&_interface);
-        if (err != NSAPI_ERROR_OK) {
-            return err;
-        }
-        _iface_shared.iface_sta = NULL;
-    }
-
     res = whd_wifi_deregister_event_handler(_whd_emac.ifp, sta_link_update_entry);
     if (res != WHD_SUCCESS) {
         return whd_toerror(res);

features/netsocket/emac-drivers/TARGET_Cypress/COMPONENT_WHD/interface/WhdSoftAPInterface.cpp

@@ -201,16 +201,6 @@ int WhdSoftAPInterface::stop(void)
     if (res != WHD_SUCCESS) {
         return whd_toerror(res);
     }
-
-    // remove the interface added in start
-    if (_interface) {
-        nsapi_error_t err = _stack.remove_ethernet_interface(&_interface);
-        if (err != NSAPI_ERROR_OK) {
-            return err;
-        }
-        _iface_shared.iface_softap = NULL;
-    }
-
     return NSAPI_ERROR_OK;
 }