From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 31 Oct 2012 19:28:11 +0000 (+0100)
Subject: uloop: fix tv_diff() calculation
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=commitdiff_plain;h=407f7a0bb3272ee03f2eb05391ce8b94238fa92e

uloop: fix tv_diff() calculation

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---

diff --git a/uloop.c b/uloop.c
index 6bc974d..a28bce8 100644
--- a/uloop.c
+++ b/uloop.c
@@ -304,10 +304,9 @@ out:
 
 static int tv_diff(struct timeval *t1, struct timeval *t2)
 {
-	if (t1->tv_sec != t2->tv_sec)
-		return (t1->tv_sec - t2->tv_sec) * 1000;
-	else
-		return (t1->tv_usec - t2->tv_usec) / 1000;
+	return
+		(t1->tv_sec - t2->tv_sec) * 1000 +
+		(t1->tv_usec - t2->tv_usec) / 1000;
 }
 
 int uloop_timeout_add(struct uloop_timeout *timeout)