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

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

sockopt: Rename SO_TIMESTAMP* to SO_TIMESTAMP*_OLD 



SO_TIMESTAMP, SO_TIMESTAMPNS and SO_TIMESTAMPING options, the
way they are currently defined, are not y2038 safe.
Subsequent patches in the series add new y2038 safe versions
of these options which provide 64 bit timestamps on all
architectures uniformly.
Hence, rename existing options with OLD tag suffixes.

Also note that kernel will not use the untagged SO_TIMESTAMP*
and SCM_TIMESTAMP* options internally anymore.

Signed-off-by: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Acked-by: default avatarWillem de Bruijn <willemb@google.com>
Cc: deller@gmx.de
Cc: dhowells@redhat.com
Cc: jejb@parisc-linux.org
Cc: ralf@linux-mips.org
Cc: rth@twiddle.net
Cc: linux-afs@lists.infradead.org
Cc: linux-alpha@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: linux-parisc@vger.kernel.org
Cc: linux-rdma@vger.kernel.org
Cc: sparclinux@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2edfd8e0

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

+16 −7
Original line number Diff line number Diff line
@@ -51,13 +51,9 @@ 
#define SO_GET_FILTER		SO_ATTACH_FILTER



#define SO_PEERNAME		28

#define SO_TIMESTAMP		29

#define SCM_TIMESTAMP		SO_TIMESTAMP



#define SO_PEERSEC		30

#define SO_PASSSEC		34

#define SO_TIMESTAMPNS		35

#define SCM_TIMESTAMPNS		SO_TIMESTAMPNS



/* Security levels - as per NRL IPv6 - don't actually do anything */

#define SO_SECURITY_AUTHENTICATION		19
@@ -66,9 +62,6 @@ 


#define SO_MARK			36



#define SO_TIMESTAMPING		37

#define SCM_TIMESTAMPING	SO_TIMESTAMPING



#define SO_RXQ_OVFL             40



#define SO_WIFI_STATUS		41
@@ -117,4 +110,20 @@ 


#define SO_BINDTOIFINDEX	62



#define SO_TIMESTAMP_OLD        29

#define SO_TIMESTAMPNS_OLD      35

#define SO_TIMESTAMPING_OLD     37



#if !defined(__KERNEL__)



#define SO_TIMESTAMP            SO_TIMESTAMP_OLD

#define SO_TIMESTAMPNS          SO_TIMESTAMPNS_OLD

#define SO_TIMESTAMPING         SO_TIMESTAMPING_OLD



#define SCM_TIMESTAMP           SO_TIMESTAMP

#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS

#define SCM_TIMESTAMPING        SO_TIMESTAMPING



#endif



#endif /* _UAPI_ASM_SOCKET_H */

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

+16 −7
Original line number Diff line number Diff line
@@ -65,21 +65,14 @@ 
#define SO_GET_FILTER		SO_ATTACH_FILTER



#define SO_PEERNAME		28

#define SO_TIMESTAMP		29

#define SCM_TIMESTAMP		SO_TIMESTAMP



#define SO_PEERSEC		30

#define SO_SNDBUFFORCE		31

#define SO_RCVBUFFORCE		33

#define SO_PASSSEC		34

#define SO_TIMESTAMPNS		35

#define SCM_TIMESTAMPNS		SO_TIMESTAMPNS



#define SO_MARK			36



#define SO_TIMESTAMPING		37

#define SCM_TIMESTAMPING	SO_TIMESTAMPING



#define SO_RXQ_OVFL		40



#define SO_WIFI_STATUS		41
@@ -128,4 +121,20 @@ 


#define SO_BINDTOIFINDEX	62



#define SO_TIMESTAMP_OLD        29

#define SO_TIMESTAMPNS_OLD      35

#define SO_TIMESTAMPING_OLD     37



#if !defined(__KERNEL__)



#define SO_TIMESTAMP            SO_TIMESTAMP_OLD

#define SO_TIMESTAMPNS          SO_TIMESTAMPNS_OLD

#define SO_TIMESTAMPING         SO_TIMESTAMPING_OLD



#define SCM_TIMESTAMP           SO_TIMESTAMP

#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS

#define SCM_TIMESTAMPING        SO_TIMESTAMPING



#endif



#endif /* _UAPI_ASM_SOCKET_H */

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

+16 −7
Original line number Diff line number Diff line
@@ -34,10 +34,6 @@ 
#define SO_BSDCOMPAT	0x400e

#define SO_PASSCRED	0x4010

#define SO_PEERCRED	0x4011

#define SO_TIMESTAMP	0x4012

#define SCM_TIMESTAMP	SO_TIMESTAMP

#define SO_TIMESTAMPNS	0x4013

#define SCM_TIMESTAMPNS	SO_TIMESTAMPNS



/* Security levels - as per NRL IPv6 - don't actually do anything */

#define SO_SECURITY_AUTHENTICATION		0x4016
@@ -58,9 +54,6 @@ 


#define SO_MARK			0x401f



#define SO_TIMESTAMPING		0x4020

#define SCM_TIMESTAMPING	SO_TIMESTAMPING



#define SO_RXQ_OVFL             0x4021



#define SO_WIFI_STATUS		0x4022
@@ -109,4 +102,20 @@ 


#define SO_BINDTOIFINDEX	0x4037



#define SO_TIMESTAMP_OLD        0x4012

#define SO_TIMESTAMPNS_OLD      0x4013

#define SO_TIMESTAMPING_OLD     0x4020



#if !defined(__KERNEL__)



#define SO_TIMESTAMP            SO_TIMESTAMP_OLD

#define SO_TIMESTAMPNS          SO_TIMESTAMPNS_OLD

#define SO_TIMESTAMPING         SO_TIMESTAMPING_OLD



#define SCM_TIMESTAMP           SO_TIMESTAMP

#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS

#define SCM_TIMESTAMPING        SO_TIMESTAMPING



#endif



#endif /* _UAPI_ASM_SOCKET_H */

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

+16 −8
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#define SO_PROTOCOL	0x1028

#define SO_DOMAIN	0x1029





/* Linux specific, keep the same. */

#define SO_NO_CHECK	0x000b

#define SO_PRIORITY	0x000c
@@ -45,19 +44,12 @@ 
#define SO_GET_FILTER		SO_ATTACH_FILTER



#define SO_PEERNAME		0x001c

#define SO_TIMESTAMP		0x001d

#define SCM_TIMESTAMP		SO_TIMESTAMP



#define SO_PEERSEC		0x001e

#define SO_PASSSEC		0x001f

#define SO_TIMESTAMPNS		0x0021

#define SCM_TIMESTAMPNS		SO_TIMESTAMPNS



#define SO_MARK			0x0022



#define SO_TIMESTAMPING		0x0023

#define SCM_TIMESTAMPING	SO_TIMESTAMPING



#define SO_RXQ_OVFL             0x0024



#define SO_WIFI_STATUS		0x0025
@@ -111,4 +103,20 @@ 
#define SO_SECURITY_ENCRYPTION_TRANSPORT	0x5002

#define SO_SECURITY_ENCRYPTION_NETWORK		0x5004



#define SO_TIMESTAMP_OLD         0x001d

#define SO_TIMESTAMPNS_OLD       0x0021

#define SO_TIMESTAMPING_OLD      0x0023



#if !defined(__KERNEL__)



#define SO_TIMESTAMP           SO_TIMESTAMP_OLD

#define SO_TIMESTAMPNS         SO_TIMESTAMPNS_OLD

#define SO_TIMESTAMPING        SO_TIMESTAMPING_OLD



#define SCM_TIMESTAMP          SO_TIMESTAMP

#define SCM_TIMESTAMPNS        SO_TIMESTAMPNS

#define SCM_TIMESTAMPING       SO_TIMESTAMPING



#endif



#endif /* _ASM_SOCKET_H */

include/uapi/asm-generic/socket.h

+16 −7
Original line number Diff line number Diff line
@@ -46,21 +46,14 @@ 
#define SO_GET_FILTER		SO_ATTACH_FILTER



#define SO_PEERNAME		28

#define SO_TIMESTAMP		29

#define SCM_TIMESTAMP		SO_TIMESTAMP



#define SO_ACCEPTCONN		30



#define SO_PEERSEC		31

#define SO_PASSSEC		34

#define SO_TIMESTAMPNS		35

#define SCM_TIMESTAMPNS		SO_TIMESTAMPNS



#define SO_MARK			36



#define SO_TIMESTAMPING		37

#define SCM_TIMESTAMPING	SO_TIMESTAMPING



#define SO_PROTOCOL		38

#define SO_DOMAIN		39
@@ -112,4 +105,20 @@ 


#define SO_BINDTOIFINDEX	62



#define SO_TIMESTAMP_OLD        29

#define SO_TIMESTAMPNS_OLD      35

#define SO_TIMESTAMPING_OLD     37



#if !defined(__KERNEL__)



#define SO_TIMESTAMP            SO_TIMESTAMP_OLD

#define SO_TIMESTAMPNS          SO_TIMESTAMPNS_OLD

#define SO_TIMESTAMPING         SO_TIMESTAMPING_OLD



#define SCM_TIMESTAMP           SO_TIMESTAMP

#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS

#define SCM_TIMESTAMPING        SO_TIMESTAMPING



#endif



#endif /* __ASM_GENERIC_SOCKET_H */