Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45bdc661 authored by Deepa Dinamani's avatar Deepa Dinamani Committed by David S. Miller
Browse files

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: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Acked-by: default avatarWillem 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: default avatarDavid S. Miller <davem@davemloft.net>
parent 9dd49211

arch/alpha/include/uapi/asm/socket.h

+5 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
#define SO_RCVBUFFORCE	0x100b

#define	SO_RCVLOWAT	0x1010

#define	SO_SNDLOWAT	0x1011

#define	SO_RCVTIMEO	0x1012

#define	SO_SNDTIMEO	0x1013

#define	SO_RCVTIMEO_OLD	0x1012

#define	SO_SNDTIMEO_OLD	0x1013

#define SO_ACCEPTCONN	0x1014

#define SO_PROTOCOL	0x1028

#define SO_DOMAIN	0x1029
@@ -121,6 +121,9 @@ 


#if !defined(__KERNEL__)



#define	SO_RCVTIMEO SO_RCVTIMEO_OLD

#define	SO_SNDTIMEO SO_SNDTIMEO_OLD



#if __BITS_PER_LONG == 64

#define SO_TIMESTAMP		SO_TIMESTAMP_OLD

#define SO_TIMESTAMPNS		SO_TIMESTAMPNS_OLD

arch/mips/include/uapi/asm/socket.h

+4 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ 
#define SO_RCVBUF	0x1002	/* Receive buffer. */

#define SO_SNDLOWAT	0x1003	/* send low-water mark */

#define SO_RCVLOWAT	0x1004	/* receive low-water mark */

#define SO_SNDTIMEO	0x1005	/* send timeout */

#define SO_RCVTIMEO	0x1006	/* receive timeout */

#define SO_SNDTIMEO_OLD	0x1005	/* send timeout */

#define SO_RCVTIMEO_OLD	0x1006	/* receive timeout */

#define SO_ACCEPTCONN	0x1009

#define SO_PROTOCOL	0x1028	/* protocol type */

#define SO_DOMAIN	0x1029	/* domain/socket family */
@@ -132,6 +132,8 @@ 


#if !defined(__KERNEL__)



#define	SO_RCVTIMEO SO_RCVTIMEO_OLD

#define	SO_SNDTIMEO SO_SNDTIMEO_OLD

#if __BITS_PER_LONG == 64

#define SO_TIMESTAMP		SO_TIMESTAMP_OLD

#define SO_TIMESTAMPNS		SO_TIMESTAMPNS_OLD

arch/parisc/include/uapi/asm/socket.h

+4 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
#define SO_RCVBUFFORCE	0x100b

#define SO_SNDLOWAT	0x1003

#define SO_RCVLOWAT	0x1004

#define SO_SNDTIMEO	0x1005

#define SO_RCVTIMEO	0x1006

#define SO_SNDTIMEO_OLD	0x1005

#define SO_RCVTIMEO_OLD	0x1006

#define SO_ERROR	0x1007

#define SO_TYPE		0x1008

#define SO_PROTOCOL	0x1028
@@ -113,6 +113,8 @@ 


#if !defined(__KERNEL__)



#define	SO_RCVTIMEO SO_RCVTIMEO_OLD

#define	SO_SNDTIMEO SO_SNDTIMEO_OLD

#if __BITS_PER_LONG == 64

#define SO_TIMESTAMP		SO_TIMESTAMP_OLD

#define SO_TIMESTAMPNS		SO_TIMESTAMPNS_OLD

arch/powerpc/include/uapi/asm/socket.h

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ 


#define SO_RCVLOWAT	16

#define SO_SNDLOWAT	17

#define SO_RCVTIMEO	18

#define SO_SNDTIMEO	19

#define SO_RCVTIMEO_OLD	18

#define SO_SNDTIMEO_OLD	19

#define SO_PASSCRED	20

#define SO_PEERCRED	21

arch/sparc/include/uapi/asm/socket.h

+5 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
#define SO_BSDCOMPAT    0x0400

#define SO_RCVLOWAT     0x0800

#define SO_SNDLOWAT     0x1000

#define SO_RCVTIMEO     0x2000

#define SO_SNDTIMEO     0x4000

#define SO_RCVTIMEO_OLD     0x2000

#define SO_SNDTIMEO_OLD     0x4000

#define SO_ACCEPTCONN	0x8000



#define SO_SNDBUF	0x1001
@@ -114,6 +114,9 @@ 


#if !defined(__KERNEL__)



#define SO_RCVTIMEO              SO_RCVTIMEO_OLD

#define SO_SNDTIMEO              SO_SNDTIMEO_OLD



#if __BITS_PER_LONG == 64

#define SO_TIMESTAMP		SO_TIMESTAMP_OLD

#define SO_TIMESTAMPNS		SO_TIMESTAMPNS_OLD