ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6160 from TeemuKultala/status_callback_fix 

fix issue 6150
pull/6182/head
Cruz Monrreal 2018-02-22 21:56:42 -06:00 committed by GitHub
parent 55f710f431 34ef11630c
commit 1d1eef47ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/FEATURE_LWIP/lwip-interface/lwip_stack.c
View File

@ -444,9 +444,7 @@ static bool lwip_ppp = false;
static nsapi_error_t mbed_set_dhcp(struct netif *lwip_netif) 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
if (lwip_dhcp && lwip_dhcp_has_to_be_set) { if (lwip_dhcp && lwip_dhcp_has_to_be_set) {

3
features/netsocket/cellular/generic_modem_driver/PPPCellularInterface.cpp
View File

@ -702,6 +702,9 @@ nsapi_error_t PPPCellularInterface::connect()
* mbed_ppp_init() is a blocking call, it will block until * mbed_ppp_init() is a blocking call, it will block until
* connected, or timeout after 30 seconds*/ * connected, or timeout after 30 seconds*/
retcode = nsapi_ppp_connect(_fh, callback(this, &PPPCellularInterface::ppp_status_cb), _uname, _pwd, _stack); 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) && } while ((_connect_status == NSAPI_STATUS_CONNECTING && _connect_is_blocking) &&
apn_config && *apn_config); apn_config && *apn_config);