diff --git a/features/netsocket/cellular/utils/APN_db.h b/features/cellular/easy_cellular/APN_db.h similarity index 100% rename from features/netsocket/cellular/utils/APN_db.h rename to features/cellular/easy_cellular/APN_db.h diff --git a/features/netsocket/cellular/generic_modem_driver/PPPCellularInterface.cpp b/features/netsocket/cellular/generic_modem_driver/PPPCellularInterface.cpp index b07199e360..0d8e39f2f2 100644 --- a/features/netsocket/cellular/generic_modem_driver/PPPCellularInterface.cpp +++ b/features/netsocket/cellular/generic_modem_driver/PPPCellularInterface.cpp @@ -23,7 +23,7 @@ #include #include "nsapi_ppp.h" #if MBED_CONF_PPP_CELL_IFACE_APN_LOOKUP -#include "utils/APN_db.h" +#include "APN_db.h" #endif //MBED_CONF_PPP_CELL_IFACE_APN_LOOKUP #if defined(FEATURE_COMMON_PAL) #include "mbed_trace.h" @@ -574,12 +574,12 @@ nsapi_error_t PPPCellularInterface::connect() user_specified_apn = true; #endif } - + if (is_connected()) { return NSAPI_ERROR_IS_CONNECTED; } else if (_connect_status == NSAPI_STATUS_CONNECTING) { return NSAPI_ERROR_ALREADY; - } + } _connect_status = NSAPI_STATUS_CONNECTING; if (_connection_status_cb) { @@ -681,7 +681,7 @@ nsapi_error_t PPPCellularInterface::connect() } tr_info("The APN being used is %s.\n", _apn); - + /* Attempt to enter data mode */ success = set_atd(_at); //enter into Data mode with the modem if (!success) {