summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cpukit/libnetworking/ChangeLog5
-rw-r--r--cpukit/libnetworking/kern/uipc_socket.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/cpukit/libnetworking/ChangeLog b/cpukit/libnetworking/ChangeLog
index 5599427955..d77d74d53a 100644
--- a/cpukit/libnetworking/ChangeLog
+++ b/cpukit/libnetworking/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-02 Joel Sherrill <joel@OARcorp.com>
+
+ * kern/uipc_socket.c: Make sure that small non-zero delays work.
+ Suggested cleanup from Eric Norum.
+
2002-10-02 Eric Norum <eric.norum@usask.ca>
* rtems/mkrootfs.c: As part of PR283, remove redundant code that
diff --git a/cpukit/libnetworking/kern/uipc_socket.c b/cpukit/libnetworking/kern/uipc_socket.c
index b8671a2a0d..a002e61476 100644
--- a/cpukit/libnetworking/kern/uipc_socket.c
+++ b/cpukit/libnetworking/kern/uipc_socket.c
@@ -960,8 +960,9 @@ sosetopt(so, level, optname, m0)
error = EDOM;
goto bad;
}
+
val = tv->tv_sec * hz + tv->tv_usec / tick;
- if (val == 0)
+ if ((val == 0) && (tv->tv_sec || tv->tv_usec))
val = 1;
switch (optname) {