Remove incorrect code

Change-Id: I6c4dfe31cf768c8eddab1388140f409115a0537b

diff --git a/src/ip-conflict-detect.c b/src/ip-conflict-detect.c
index b21d9587180fe300f9e49c1f2d9608fad12b110a..b4fc04e20382c4a8128dbeb98b8a912b86e011ce 100755 (executable)
--- a/src/ip-conflict-detect.c
+++ b/src/ip-conflict-detect.c
@@ -464,7 +464,6 @@ gboolean handle_ip_conflict_set_enable(Wifi *wifi, GDBusMethodInvocation *contex
                        stop_ip_conflict_mon();
                else {
                        netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "AlreadyExists");
-                       wifi_complete_ip_conflict_set_enable(wifi, context);
                        return TRUE;
                }
        } else {
@@ -473,12 +472,10 @@ gboolean handle_ip_conflict_set_enable(Wifi *wifi, GDBusMethodInvocation *contex
                                INFO("Failed to start IP conflict monitoring");
                                netconfig_error_dbus_method_return(context,
                                                NETCONFIG_ERROR_INTERNAL, "Failed");
-                               wifi_complete_ip_conflict_set_enable(wifi, context);
                                return TRUE;
                        }
                } else {
                        netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "AlreadyExists");
-                       wifi_complete_ip_conflict_set_enable(wifi, context);
                        return TRUE;
                }
        }

diff --git a/src/wifi-netlink-scan.c b/src/wifi-netlink-scan.c
index 856de47951c587f0af32fd11b87428d7f5f405a5..ee64d9b11abedf891aa4f9fbc95e744d402a9f07 100755 (executable)
--- a/src/wifi-netlink-scan.c
+++ b/src/wifi-netlink-scan.c
@@ -900,7 +900,6 @@ int handle_netlink_scan(Wifi *wifi, GDBusMethodInvocation *context, GVariant *pa
        if (ret < 0) {
                DBG("__netconfig_initialize_nl80211() failed, error %d", ret);
                netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "AccessDenied");
-               wifi_complete_netlink_scan(wifi, context);
                return TRUE;
        }
 
@@ -915,7 +914,6 @@ int handle_netlink_scan(Wifi *wifi, GDBusMethodInvocation *context, GVariant *pa
        if (ret < 0) {
                DBG("__netconfig_netlink_scan() failed, error %d", ret);
                netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "AccessDenied");
-               wifi_complete_netlink_scan(wifi, context);
                __netconfig_deinitialize_nl80211(&global);
                return TRUE;
        }
@@ -923,7 +921,6 @@ int handle_netlink_scan(Wifi *wifi, GDBusMethodInvocation *context, GVariant *pa
        ret = __netconfig_get_scan_results(&global);
        if (ret < 0) {
                netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "AccessDenied");
-               wifi_complete_netlink_scan(wifi, context);
                __netconfig_deinitialize_nl80211(&global);
                return TRUE;
        }