mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-22 02:35:25 +00:00
2008-07-29 Dan Williams <dcbw@redhat.com>
* 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
This commit is contained in:
parent
bd5d38fe11
commit
87209e98d7
|
@ -1,3 +1,10 @@
|
|||
2008-07-29 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* 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 <dcbw@redhat.com>
|
||||
|
||||
Patch from Fabrice Bellet <fabrice@bellet.info>
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue