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

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

sock: Add SO_RCVTIMEO_NEW and SO_SNDTIMEO_NEW 



Add new socket timeout options that are y2038 safe.

Signed-off-by: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Acked-by: default avatarWillem de Bruijn <willemb@google.com>
Cc: ccaulfie@redhat.com
Cc: davem@davemloft.net
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 45bdc661

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

+9 −3
Original line number Diff line number Diff line
@@ -119,19 +119,25 @@ 
#define SO_TIMESTAMPNS_NEW      64

#define SO_TIMESTAMPING_NEW     65



#if !defined(__KERNEL__)

#define SO_RCVTIMEO_NEW         66

#define SO_SNDTIMEO_NEW         67



#define	SO_RCVTIMEO SO_RCVTIMEO_OLD

#define	SO_SNDTIMEO SO_SNDTIMEO_OLD

#if !defined(__KERNEL__)



#if __BITS_PER_LONG == 64

#define SO_TIMESTAMP		SO_TIMESTAMP_OLD

#define SO_TIMESTAMPNS		SO_TIMESTAMPNS_OLD

#define SO_TIMESTAMPING         SO_TIMESTAMPING_OLD



#define SO_RCVTIMEO		SO_RCVTIMEO_OLD

#define SO_SNDTIMEO		SO_SNDTIMEO_OLD

#else

#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)

#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)

#define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)



#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)

#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)

#endif



#define SCM_TIMESTAMP           SO_TIMESTAMP

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

+9 −2
Original line number Diff line number Diff line
@@ -130,18 +130,25 @@ 
#define SO_TIMESTAMPNS_NEW      64

#define SO_TIMESTAMPING_NEW     65



#define SO_RCVTIMEO_NEW         66

#define SO_SNDTIMEO_NEW         67



#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

#define SO_TIMESTAMPING		SO_TIMESTAMPING_OLD



#define SO_RCVTIMEO             SO_RCVTIMEO_OLD

#define SO_SNDTIMEO             SO_SNDTIMEO_OLD

#else

#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)

#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)

#define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)



#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)

#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)

#endif



#define SCM_TIMESTAMP           SO_TIMESTAMP

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

+8 −2
Original line number Diff line number Diff line
@@ -111,18 +111,24 @@ 
#define SO_TIMESTAMPNS_NEW      0x4039

#define SO_TIMESTAMPING_NEW     0x403A



#define SO_RCVTIMEO_NEW         0x4040

#define SO_SNDTIMEO_NEW         0x4041



#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

#define SO_TIMESTAMPING         SO_TIMESTAMPING_OLD

#define SO_RCVTIMEO		SO_RCVTIMEO_OLD

#define SO_SNDTIMEO		SO_SNDTIMEO_OLD

#else

#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)

#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)

#define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)



#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)

#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)

#endif



#define SCM_TIMESTAMP           SO_TIMESTAMP

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

+9 −2
Original line number Diff line number Diff line
@@ -112,19 +112,26 @@ 
#define SO_TIMESTAMPNS_NEW       0x0042

#define SO_TIMESTAMPING_NEW      0x0043



#define SO_RCVTIMEO_NEW          0x0044

#define SO_SNDTIMEO_NEW          0x0045



#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

#define SO_TIMESTAMPING		SO_TIMESTAMPING_OLD



#define SO_RCVTIMEO		SO_RCVTIMEO_OLD

#define SO_SNDTIMEO		SO_SNDTIMEO_OLD

#else

#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)

#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)

#define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)



#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)

#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)

#endif



#define SCM_TIMESTAMP          SO_TIMESTAMP

include/uapi/asm-generic/socket.h

+9 −2
Original line number Diff line number Diff line
@@ -114,19 +114,26 @@ 
#define SO_TIMESTAMPNS_NEW      64

#define SO_TIMESTAMPING_NEW     65



#define SO_RCVTIMEO_NEW         66

#define SO_SNDTIMEO_NEW         67



#if !defined(__KERNEL__)



#define	SO_RCVTIMEO SO_RCVTIMEO_OLD

#define	SO_SNDTIMEO SO_SNDTIMEO_OLD

#if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__))

/* on 64-bit and x32, avoid the ?: operator */

#define SO_TIMESTAMP		SO_TIMESTAMP_OLD

#define SO_TIMESTAMPNS		SO_TIMESTAMPNS_OLD

#define SO_TIMESTAMPING		SO_TIMESTAMPING_OLD



#define SO_RCVTIMEO		SO_RCVTIMEO_OLD

#define SO_SNDTIMEO		SO_SNDTIMEO_OLD

#else

#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)

#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)

#define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)



#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)

#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)

#endif



#define SCM_TIMESTAMP           SO_TIMESTAMP