Merge tag 'upstream/1.40' into tizen.

[platform/upstream/connman.git] / src / session.c

diff --git a/src/session.c b/src/session.c
index eeefe3f..69adba9 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -195,6 +195,9 @@ static char *service2bearer(enum connman_service_type type)
        case CONNMAN_SERVICE_TYPE_GPS:
        case CONNMAN_SERVICE_TYPE_P2P:
        case CONNMAN_SERVICE_TYPE_UNKNOWN:
+#if defined TIZEN_EXT_WIFI_MESH
+       case CONNMAN_SERVICE_TYPE_MESH:
+#endif
                return "";
        }
 
@@ -1753,8 +1756,16 @@ static bool session_match_service(struct connman_session *session,
                service_type = connman_service_get_type(service);
                ifname = connman_service_get_interface(service);
 
+
+#if defined TIZEN_EXT
+               if (bearer_type == current_service_type) {
+                       g_free(ifname);
+                       return false;
+               }
+#else
                if (bearer_type == current_service_type)
                        return false;
+#endif
 
                if (bearer_type == service_type &&
                        (session->info->config.allowed_interface == NULL ||