diff options
author | Deepa Dinamani <deepa.kernel@gmail.com> | 2019-02-02 07:34:53 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-02-03 11:17:31 -0800 |
commit | 45bdc66159d49bfc7f75fe02d25bc74f5d2660cf (patch) | |
tree | c27075f4ceb91aa226fe4648f1ca507f37b002a6 /net/core/sock.c | |
parent | 9dd49211b8ca85dfe7ee9054f2695fe790fa0874 (diff) | |
download | linux-stable-45bdc66159d49bfc7f75fe02d25bc74f5d2660cf.tar.gz linux-stable-45bdc66159d49bfc7f75fe02d25bc74f5d2660cf.tar.bz2 linux-stable-45bdc66159d49bfc7f75fe02d25bc74f5d2660cf.zip |
socket: Rename SO_RCVTIMEO/ SO_SNDTIMEO with _OLD suffixes
SO_RCVTIMEO and SO_SNDTIMEO socket options use struct timeval
as the time format. struct timeval is not y2038 safe.
The subsequent patches in the series add support for new socket
timeout options with _NEW suffix that will use y2038 safe
data structures. Although the existing struct timeval layout
is sufficiently wide to represent timeouts, because of the way
libc will interpret time_t based on user defined flag, these
new flags provide a way of having a structure that is the same
for all architectures consistently.
Rename the existing options with _OLD suffix forms so that the
right option is enabled for userspace applications according
to the architecture and time_t definition of libc.
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Acked-by: Willem de Bruijn <willemb@google.com>
Cc: ccaulfie@redhat.com
Cc: deller@gmx.de
Cc: paulus@samba.org
Cc: ralf@linux-mips.org
Cc: rth@twiddle.net
Cc: cluster-devel@redhat.com
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-alpha@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Cc: linux-mips@vger.kernel.org
Cc: linux-parisc@vger.kernel.org
Cc: sparclinux@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sock.c')
-rw-r--r-- | net/core/sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index a9d1ecce96e5..27b40002b780 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -941,11 +941,11 @@ set_rcvbuf: sk->sk_rcvlowat = val ? : 1; break; - case SO_RCVTIMEO: + case SO_RCVTIMEO_OLD: ret = sock_set_timeout(&sk->sk_rcvtimeo, optval, optlen); break; - case SO_SNDTIMEO: + case SO_SNDTIMEO_OLD: ret = sock_set_timeout(&sk->sk_sndtimeo, optval, optlen); break; |