12 files changed, 101 insertions, 57 deletions

diff --git a/arch/alpha/include/uapi/asm/socket.h b/arch/alpha/include/uapi/asm/socket.h
index b1c9b542c021..992a0a6dcea1 100644
--- a/arch/alpha/include/uapi/asm/socket.h
+++ b/arch/alpha/include/uapi/asm/socket.h
@@ -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 */
diff --git a/arch/mips/include/uapi/asm/socket.h b/arch/mips/include/uapi/asm/socket.h
index 73e25e35d803..0f4516c34df2 100644
--- a/arch/mips/include/uapi/asm/socket.h
+++ b/arch/mips/include/uapi/asm/socket.h
@@ -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 */
diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/uapi/asm/socket.h
index 52bed5976cbe..7c180321ebd6 100644
--- a/arch/parisc/include/uapi/asm/socket.h
+++ b/arch/parisc/include/uapi/asm/socket.h
@@ -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 */
diff --git a/arch/sparc/include/uapi/asm/socket.h b/arch/sparc/include/uapi/asm/socket.h
index bbdb81594dd4..d8a1bbc3e6c4 100644
--- a/arch/sparc/include/uapi/asm/socket.h
+++ b/arch/sparc/include/uapi/asm/socket.h
@@ -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 */
diff --git a/include/uapi/asm-generic/socket.h b/include/uapi/asm-generic/socket.h
index 3066ab3853a8..4ef3aed31fb7 100644
--- a/include/uapi/asm-generic/socket.h
+++ b/include/uapi/asm-generic/socket.h
@@ -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 */
diff --git a/net/compat.c b/net/compat.c
index ce8f6e8cdcd2..ccf93cd0e49b 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -219,7 +219,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
         }
 
         if (!COMPAT_USE_64BIT_TIME) {
-                if (level == SOL_SOCKET && type == SCM_TIMESTAMP) {
+                if (level == SOL_SOCKET && type == SO_TIMESTAMP_OLD) {
                         struct timeval *tv = (struct timeval *)data;
                         ctv.tv_sec = tv->tv_sec;
                         ctv.tv_usec = tv->tv_usec;
@@ -227,8 +227,8 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
                         len = sizeof(ctv);
                 }
                 if (level == SOL_SOCKET &&
-                    (type == SCM_TIMESTAMPNS || type == SCM_TIMESTAMPING)) {
-                        int count = type == SCM_TIMESTAMPNS ? 1 : 3;
+                    (type == SO_TIMESTAMPNS_OLD || type == SO_TIMESTAMPING_OLD)) {
+                        int count = type == SO_TIMESTAMPNS_OLD ? 1 : 3;
                         int i;
                         struct timespec *ts = (struct timespec *)data;
                         for (i = 0; i < count; i++) {
diff --git a/net/core/sock.c b/net/core/sock.c
index 29c0028df5ae..d5ca8641968f 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -867,10 +867,10 @@ set_rcvbuf:
                         clear_bit(SOCK_PASSCRED, &sock->flags);
                 break;
 
-        case SO_TIMESTAMP:
-        case SO_TIMESTAMPNS:
+        case SO_TIMESTAMP_OLD:
+        case SO_TIMESTAMPNS_OLD:
                 if (valbool)  {
-                        if (optname == SO_TIMESTAMP)
+                        if (optname == SO_TIMESTAMP_OLD)
                                 sock_reset_flag(sk, SOCK_RCVTSTAMPNS);
                         else
                                 sock_set_flag(sk, SOCK_RCVTSTAMPNS);
@@ -882,7 +882,7 @@ set_rcvbuf:
                 }
                 break;
 
-        case SO_TIMESTAMPING:
+        case SO_TIMESTAMPING_OLD:
                 if (val & ~SOF_TIMESTAMPING_MASK) {
                         ret = -EINVAL;
                         break;
@@ -1243,16 +1243,16 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
                 sock_warn_obsolete_bsdism("getsockopt");
                 break;
 
-        case SO_TIMESTAMP:
+        case SO_TIMESTAMP_OLD:
                 v.val = sock_flag(sk, SOCK_RCVTSTAMP) &&
                                 !sock_flag(sk, SOCK_RCVTSTAMPNS);
                 break;
 
-        case SO_TIMESTAMPNS:
+        case SO_TIMESTAMPNS_OLD:
                 v.val = sock_flag(sk, SOCK_RCVTSTAMPNS);
                 break;
 
-        case SO_TIMESTAMPING:
+        case SO_TIMESTAMPING_OLD:
                 v.val = sk->sk_tsflags;
                 break;
 
@@ -2168,7 +2168,7 @@ int __sock_cmsg_send(struct sock *sk, struct msghdr *msg, struct cmsghdr *cmsg,
                         return -EINVAL;
                 sockc->mark = *(u32 *)CMSG_DATA(cmsg);
                 break;
-        case SO_TIMESTAMPING:
+        case SO_TIMESTAMPING_OLD:
                 if (cmsg->cmsg_len != CMSG_LEN(sizeof(u32)))
                         return -EINVAL;
 
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 6f8d292ad501..e29aec59cad1 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1867,13 +1867,13 @@ static void tcp_recv_timestamp(struct msghdr *msg, const struct sock *sk,
         if (tss->ts[0].tv_sec || tss->ts[0].tv_nsec) {
                 if (sock_flag(sk, SOCK_RCVTSTAMP)) {
                         if (sock_flag(sk, SOCK_RCVTSTAMPNS)) {
-                                put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMPNS,
+                                put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMPNS_OLD,
                                          sizeof(tss->ts[0]), &tss->ts[0]);
                         } else {
                                 tv.tv_sec = tss->ts[0].tv_sec;
                                 tv.tv_usec = tss->ts[0].tv_nsec / 1000;
 
-                                put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMP,
+                                put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMP_OLD,
                                          sizeof(tv), &tv);
                         }
                 }
@@ -1893,7 +1893,7 @@ static void tcp_recv_timestamp(struct msghdr *msg, const struct sock *sk,
 
         if (has_timestamping) {
                 tss->ts[1] = (struct timespec) {0};
-                put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMPING,
+                put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMPING_OLD,
                          sizeof(*tss), tss);
         }
 }
diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c
index 65387e1e6964..eeb4639adbe5 100644
--- a/net/rds/af_rds.c
+++ b/net/rds/af_rds.c
@@ -430,7 +430,7 @@ static int rds_setsockopt(struct socket *sock, int level, int optname,
                 ret = rds_set_transport(rs, optval, optlen);
                 release_sock(sock->sk);
                 break;
-        case SO_TIMESTAMP:
+        case SO_TIMESTAMP_OLD:
                 lock_sock(sock->sk);
                 ret = rds_enable_recvtstamp(sock->sk, optval, optlen);
                 release_sock(sock->sk);
diff --git a/net/rds/recv.c b/net/rds/recv.c
index 727639dac8a7..04e30d63a159 100644
--- a/net/rds/recv.c
+++ b/net/rds/recv.c
@@ -550,7 +550,7 @@ static int rds_cmsg_recv(struct rds_incoming *inc, struct msghdr *msg,
         if ((inc->i_rx_tstamp != 0) &&
             sock_flag(rds_rs_to_sk(rs), SOCK_RCVTSTAMP)) {
                 struct timeval tv = ktime_to_timeval(inc->i_rx_tstamp);
-                ret = put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMP,
+                ret = put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMP_OLD,
                                sizeof(tv), &tv);
                 if (ret)
                         goto out;
diff --git a/net/rxrpc/local_object.c b/net/rxrpc/local_object.c
index 0906e51d3cfb..15cf42d5b53a 100644
--- a/net/rxrpc/local_object.c
+++ b/net/rxrpc/local_object.c
@@ -202,7 +202,7 @@ static int rxrpc_open_socket(struct rxrpc_local *local, struct net *net)
 
                 /* We want receive timestamps. */
                 opt = 1;
-                ret = kernel_setsockopt(local->socket, SOL_SOCKET, SO_TIMESTAMPNS,
+                ret = kernel_setsockopt(local->socket, SOL_SOCKET, SO_TIMESTAMPNS_OLD,
                                         (char *)&opt, sizeof(opt));
                 if (ret < 0) {
                         _debug("setsockopt failed");
diff --git a/net/socket.c b/net/socket.c
index e89884e2197b..5087f9e40f3a 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -669,7 +669,7 @@ static bool skb_is_err_queue(const struct sk_buff *skb)
  * before the software timestamp is received, a hardware TX timestamp may be
  * returned only if there is no software TX timestamp. Ignore false software
  * timestamps, which may be made in the __sock_recv_timestamp() call when the
- * option SO_TIMESTAMP(NS) is enabled on the socket, even when the skb has a
+ * option SO_TIMESTAMP_OLD(NS) is enabled on the socket, even when the skb has a
  * hardware timestamp.
  */
 static bool skb_is_swtx_tstamp(const struct sk_buff *skb, int false_tstamp)
@@ -721,12 +721,12 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
                 if (!sock_flag(sk, SOCK_RCVTSTAMPNS)) {
                         struct timeval tv;
                         skb_get_timestamp(skb, &tv);
-                        put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMP,
+                        put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMP_OLD,
                                  sizeof(tv), &tv);
                 } else {
                         struct timespec ts;
                         skb_get_timestampns(skb, &ts);
-                        put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMPNS,
+                        put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMPNS_OLD,
                                  sizeof(ts), &ts);
                 }
         }
@@ -746,7 +746,7 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
         }
         if (!empty) {
                 put_cmsg(msg, SOL_SOCKET,
-                         SCM_TIMESTAMPING, sizeof(tss), &tss);
+                         SO_TIMESTAMPING_OLD, sizeof(tss), &tss);
 
                 if (skb_is_err_queue(skb) && skb->len &&
                     SKB_EXT_ERR(skb)->opt_stats)