Merge pull request #6160 from TeemuKultala/status_callback_fix

fix issue 6150
ARMmbed · Feb 23, 2018 · 1d1eef4 · 1d1eef4
2 parents 55f710f + 34ef116
commit 1d1eef4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/features/FEATURE_LWIP/lwip-interface/lwip_stack.c b/features/FEATURE_LWIP/lwip-interface/lwip_stack.c
@@ -444,9 +444,7 @@ static bool lwip_ppp = false;
 
 static nsapi_error_t mbed_set_dhcp(struct netif *lwip_netif)
 {
-    if (!lwip_ppp) {
-        netif_set_up(lwip_netif);
-    }
+    netif_set_up(lwip_netif);
 
 #if LWIP_DHCP
     if (lwip_dhcp && lwip_dhcp_has_to_be_set) {

diff --git a/features/netsocket/cellular/generic_modem_driver/PPPCellularInterface.cpp b/features/netsocket/cellular/generic_modem_driver/PPPCellularInterface.cpp
@@ -702,6 +702,9 @@ nsapi_error_t PPPCellularInterface::connect()
          * mbed_ppp_init() is a blocking call, it will block until
          * connected, or timeout after 30 seconds*/
         retcode = nsapi_ppp_connect(_fh, callback(this, &PPPCellularInterface::ppp_status_cb), _uname, _pwd, _stack);
+        if (retcode == NSAPI_ERROR_OK && _connect_is_blocking) {
+            _connect_status = NSAPI_STATUS_GLOBAL_UP;
+        }
     } while ((_connect_status == NSAPI_STATUS_CONNECTING && _connect_is_blocking) &&
             apn_config && *apn_config);