From 87209e98d7a3a3bcffc280365cde51097b265b6b Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 29 Jul 2008 20:25:02 +0000 Subject: [PATCH] 2008-07-29 Dan Williams * src/nm-serial-device.c - (nm_serial_device_wait_for_reply): fix timeout calculation. Since time(2) is used for current time, which returns seconds, we shouldn't be multiplying by 1000. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3871 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 7 +++++++ src/nm-serial-device.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 85d41b54da..14292064f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-07-29 Dan Williams + + * src/nm-serial-device.c + - (nm_serial_device_wait_for_reply): fix timeout calculation. Since + time(2) is used for current time, which returns seconds, we shouldn't + be multiplying by 1000. + 2008-07-28 Dan Williams Patch from Fabrice Bellet diff --git a/src/nm-serial-device.c b/src/nm-serial-device.c index cfb7d0102a..7b7482c034 100644 --- a/src/nm-serial-device.c +++ b/src/nm-serial-device.c @@ -768,7 +768,7 @@ nm_serial_device_wait_for_reply (NMSerialDevice *device, info->callback = callback; info->user_data = user_data; info->reply_index = -1; - info->timeout = timeout * 1000; + info->timeout = timeout; info->start = time (NULL); return nm_serial_device_set_pending (device, timeout, wait_for_reply_got_data, info, wait_for_reply_done);