Make calls to __connman_ipconfig_disable() consistent.
authorJukka Rissanen <jukka.rissanen@nokia.com>
Mon, 3 Jan 2011 09:55:23 +0000 (11:55 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Mon, 3 Jan 2011 19:38:51 +0000 (11:38 -0800)
src/service.c

index 18b0340..09cc4eb 100644 (file)
@@ -2233,11 +2233,11 @@ static gboolean connect_timeout(gpointer user_data)
                __connman_network_disconnect(service->network);
 
        if (service->ipconfig_ipv4)
-               if (!__connman_ipconfig_disable(service->ipconfig_ipv4))
+               if (__connman_ipconfig_disable(service->ipconfig_ipv4) == 0)
                        service->ipconfig_ipv4 = NULL;
 
        if (service->ipconfig_ipv6)
-               if (!__connman_ipconfig_disable(service->ipconfig_ipv6))
+               if (__connman_ipconfig_disable(service->ipconfig_ipv6) == 0)
                        service->ipconfig_ipv6 = NULL;
 
        __connman_stats_service_unregister(service);
@@ -3352,13 +3352,13 @@ int __connman_service_connect(struct connman_service *service)
        if (err < 0) {
                if (err != -EINPROGRESS) {
                        if (service->ipconfig_ipv4)
-                               if (!__connman_ipconfig_disable(
-                                                   service->ipconfig_ipv4))
+                               if (__connman_ipconfig_disable(
+                                               service->ipconfig_ipv4) == 0)
                                        service->ipconfig_ipv4 = NULL;
 
                        if (service->ipconfig_ipv6)
-                               if (!__connman_ipconfig_disable(
-                                                   service->ipconfig_ipv6))
+                               if (__connman_ipconfig_disable(
+                                               service->ipconfig_ipv6) == 0)
                                        service->ipconfig_ipv6 = NULL;
 
                        __connman_stats_service_unregister(service);