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: Deepa Dinamani <deepa.kernel@gmail.com>
Acked-by: Willem 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: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 3 deletions

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);
         }
 }