diff options
| -rw-r--r-- | packaging/connman.spec | 2 | ||||
| -rw-r--r-- | plugins/ethernet.c | 5 | ||||
| -rwxr-xr-x | src/service.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/packaging/connman.spec b/packaging/connman.spec index 54bc17f6..c62c806c 100644 --- a/packaging/connman.spec +++ b/packaging/connman.spec @@ -5,7 +5,7 @@ Name: connman Version: 1.37 -Release: 44 +Release: 46 License: GPL-2.0+ Summary: Connection Manager Url: http://connman.net diff --git a/plugins/ethernet.c b/plugins/ethernet.c index 57d65424..2a91e2f3 100644 --- a/plugins/ethernet.c +++ b/plugins/ethernet.c @@ -437,7 +437,10 @@ static void eth_dev_remove(struct connman_device *device) connman_device_set_data(device, NULL); #if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET - if (ethernet && ethernet->interface) { + if (!ethernet) + return; + + if (ethernet->interface) { g_supplicant_interface_remove(ethernet->interface, NULL, NULL); ethernet->interface = NULL; } diff --git a/src/service.c b/src/service.c index 99f52e07..90ff7e5e 100755 --- a/src/service.c +++ b/src/service.c @@ -4396,7 +4396,7 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited, #if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET connman_dbus_dict_append_dict(dict, "EapOverEthernet", append_eap_over_ethernet, service); - + /* fall through */ #endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */ case CONNMAN_SERVICE_TYPE_BLUETOOTH: case CONNMAN_SERVICE_TYPE_GADGET: |