Merge "ip-conflict: Don't remove already removed timer" into tizen

diff --git a/src/ip-conflict-detect.c b/src/ip-conflict-detect.c
index fab3976..adb9124 100755 (executable)
--- a/src/ip-conflict-detect.c
+++ b/src/ip-conflict-detect.c
@@ -127,8 +127,6 @@ static gboolean __arp_reply_timeout_cb(gpointer data)
 
        sd->iteration++;
        sd->arp_reply_timer = -1;
-       if (sd->timer_id != -1)
-               g_source_remove(sd->timer_id);
 
        if (conflict_state != NETCONFIG_IP_CONFLICT_STATE_CONFLICT_NOT_DETECTED &&
                        sd->iteration == CONFLICT_REMOVE_ITERATION_LIMIT) {