Merge "Add support for dlog" into tizen

diff --git a/packaging/connman.spec b/packaging/connman.spec
index 54bc17f..c62c806 100644 (file)
--- 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 57d6542..2a91e2f 100644 (file)
--- 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 99f52e0..90ff7e5 100755 (executable)
--- 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: