diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-10-02 17:35:29 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-10-02 17:35:29 +0000 |
commit | 6ca248c37cb03ef082184da0ee0d09848e238b10 (patch) | |
tree | a827f3709d93fe12814e1c9da45a0a278b0d10f3 | |
parent | 2002-10-02 Eric Norum <eric.norum@usask.ca> (diff) | |
download | rtems-6ca248c37cb03ef082184da0ee0d09848e238b10.tar.bz2 |
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.
Diffstat (limited to '')
-rw-r--r-- | cpukit/libnetworking/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/libnetworking/kern/uipc_socket.c | 3 |
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) { |