From: Jaehyun Kim <jeik01.kim@samsung.com>
Date: Wed, 7 Oct 2020 11:08:12 +0000 (+0000)
Subject: Merge "Add support for dlog" into tizen
X-Git-Tag: accepted/tizen/6.0/unified/20201030.105121~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=23af53cf192b6f0b4faccac2883dbf1826585c01;hp=92632d79d49dd50e5a162b2cb78ca53a75d570e2;p=platform%2Fupstream%2Fconnman.git

Merge "Add support for dlog" into tizen
---

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