Rename SO_TIMESTAMP* to SO_TIMESTAMP*_OLD

Follow the Linux kernel commit v5.1-rc1~178^2~363^2~8 and rename
these constants everywhere.

* xlat/scmvals.in (SO_TIMESTAMP): Rename to SO_TIMESTAMP_OLD.
(SO_TIMESTAMPNS): Rename to SO_TIMESTAMPNS_OLD.
(SO_TIMESTAMPING): Rename to SO_TIMESTAMPING_OLD.
* xlat/sock_options.in: Likewise.
* xlat/sock_rds_options.in: Likewise.
* msghdr.c (cmsg_socket_printers): Likewise.
(print_scm_timestamp): Rename to print_scm_timestamp_old.
(print_scm_timestampns): Rename to print_scm_timestampns_old.
(print_scm_timestamping): Rename to print_scm_timestamping_old.
* tests/msg_control.c (test_scm_timestamp): Rename SO_TIMESTAMP
to SO_TIMESTAMP_OLD.
(test_scm_timestampns): Rename SO_TIMESTAMPNS to SO_TIMESTAMPNS_OLD.
(test_scm_timestamping): Rename SO_TIMESTAMPING to SO_TIMESTAMPING_OLD.
* tests/sockopt-timestamp.c (main): Rename SO_TIMESTAMP and
SO_TIMESTAMPNS to SO_TIMESTAMP_OLD and SO_TIMESTAMPNS_OLD, respectively.

diff --git a/msghdr.c b/msghdr.c
index e05c321e1222bb86264907348cd19a47614ea77a..bb347729517da90e05cb2dc5c122062eebc16de5 100644 (file)
--- a/msghdr.c
+++ b/msghdr.c
@@ -83,22 +83,22 @@ print_scm_security(struct tcb *tcp, const void *cmsg_data,
 }
 
 static void
-print_scm_timestamp(struct tcb *tcp, const void *cmsg_data,
-                   const unsigned int data_len)
+print_scm_timestamp_old(struct tcb *tcp, const void *cmsg_data,
+                       const unsigned int data_len)
 {
        print_struct_timeval_data_size(cmsg_data, data_len);
 }
 
 static void
-print_scm_timestampns(struct tcb *tcp, const void *cmsg_data,
-                     const unsigned int data_len)
+print_scm_timestampns_old(struct tcb *tcp, const void *cmsg_data,
+                         const unsigned int data_len)
 {
        print_struct_timespec_data_size(cmsg_data, data_len);
 }
 
 static void
-print_scm_timestamping(struct tcb *tcp, const void *cmsg_data,
-                      const unsigned int data_len)
+print_scm_timestamping_old(struct tcb *tcp, const void *cmsg_data,
+                          const unsigned int data_len)
 {
        print_struct_timespec_array_data_size(cmsg_data, 3, data_len);
 }
@@ -200,9 +200,9 @@ static const struct {
        [SCM_RIGHTS] = { print_scm_rights, sizeof(int) },
        [SCM_CREDENTIALS] = { print_scm_creds, sizeof(struct ucred) },
        [SCM_SECURITY] = { print_scm_security, 1 },
-       [SO_TIMESTAMP] = { print_scm_timestamp, 1 },
-       [SO_TIMESTAMPNS] = { print_scm_timestampns, 1 },
-       [SO_TIMESTAMPING] = { print_scm_timestamping, 1 }
+       [SO_TIMESTAMP_OLD] = { print_scm_timestamp_old, 1 },
+       [SO_TIMESTAMPNS_OLD] = { print_scm_timestampns_old, 1 },
+       [SO_TIMESTAMPING_OLD] = { print_scm_timestamping_old, 1 }
 }, cmsg_ip_printers[] = {
        [IP_PKTINFO] = { print_cmsg_ip_pktinfo, sizeof(struct in_pktinfo) },
        [IP_TTL] = { print_cmsg_uint, sizeof(unsigned int) },

diff --git a/tests/msg_control.c b/tests/msg_control.c
index 76df37e276c865e2db215cc73fe49ce8ffd4714c..84d6ccff474006ef6b70b3583f56966f9d836eef 100644 (file)
--- a/tests/msg_control.c
+++ b/tests/msg_control.c
@@ -217,7 +217,7 @@ test_scm_timestamp(struct msghdr *const mh, void *const page)
 
        cmsg->cmsg_len = CMSG_LEN(sizeof(struct timeval));
        cmsg->cmsg_level = SOL_SOCKET;
-       cmsg->cmsg_type = SO_TIMESTAMP;
+       cmsg->cmsg_type = SO_TIMESTAMP_OLD;
        struct timeval *tv = (struct timeval *) CMSG_DATA(cmsg);
        tv->tv_sec = 123456789;
        tv->tv_usec = 987654;
@@ -228,7 +228,7 @@ test_scm_timestamp(struct msghdr *const mh, void *const page)
        int rc = sendmsg(-1, mh, 0);
        printf("sendmsg(-1, {msg_name=NULL, msg_namelen=0, msg_iov=NULL"
               ", msg_iovlen=0, msg_control=[{cmsg_len=%u"
-              ", cmsg_level=SOL_SOCKET, cmsg_type=SO_TIMESTAMP"
+              ", cmsg_level=SOL_SOCKET, cmsg_type=SO_TIMESTAMP_OLD"
               ", cmsg_data={tv_sec=%lld, tv_usec=%llu}}]"
               ", msg_controllen=%lu, msg_flags=0}, 0) = %d %s (%m)\n",
               (unsigned) cmsg->cmsg_len,
@@ -240,7 +240,7 @@ test_scm_timestamp(struct msghdr *const mh, void *const page)
 
        cmsg->cmsg_len = CMSG_LEN(sizeof(struct timeval) - sizeof(long));
        cmsg->cmsg_level = SOL_SOCKET;
-       cmsg->cmsg_type = SO_TIMESTAMP;
+       cmsg->cmsg_type = SO_TIMESTAMP_OLD;
 
        mh->msg_control = cmsg;
        mh->msg_controllen = len;
@@ -248,7 +248,7 @@ test_scm_timestamp(struct msghdr *const mh, void *const page)
        rc = sendmsg(-1, mh, 0);
        printf("sendmsg(-1, {msg_name=NULL, msg_namelen=0, msg_iov=NULL"
               ", msg_iovlen=0, msg_control=[{cmsg_len=%u"
-              ", cmsg_level=SOL_SOCKET, cmsg_type=SO_TIMESTAMP, cmsg_data=?}]"
+              ", cmsg_level=SOL_SOCKET, cmsg_type=SO_TIMESTAMP_OLD, cmsg_data=?}]"
               ", msg_controllen=%lu, msg_flags=0}, 0) = %d %s (%m)\n",
               (unsigned) cmsg->cmsg_len,
               (unsigned long) len, rc, errno2name());
@@ -262,7 +262,7 @@ test_scm_timestampns(struct msghdr *const mh, void *const page)
 
        cmsg->cmsg_len = CMSG_LEN(sizeof(struct timespec));
        cmsg->cmsg_level = SOL_SOCKET;
-       cmsg->cmsg_type = SO_TIMESTAMPNS;
+       cmsg->cmsg_type = SO_TIMESTAMPNS_OLD;
        struct timespec *ts = (struct timespec *) CMSG_DATA(cmsg);
        ts->tv_sec = 123456789;
        ts->tv_nsec = 987654321;
@@ -273,7 +273,7 @@ test_scm_timestampns(struct msghdr *const mh, void *const page)
        int rc = sendmsg(-1, mh, 0);
        printf("sendmsg(-1, {msg_name=NULL, msg_namelen=0, msg_iov=NULL"
               ", msg_iovlen=0, msg_control=[{cmsg_len=%u"
-              ", cmsg_level=SOL_SOCKET, cmsg_type=SO_TIMESTAMPNS"
+              ", cmsg_level=SOL_SOCKET, cmsg_type=SO_TIMESTAMPNS_OLD"
               ", cmsg_data={tv_sec=%lld, tv_nsec=%llu}}]"
               ", msg_controllen=%lu, msg_flags=0}, 0) = %d %s (%m)\n",
               (unsigned) cmsg->cmsg_len,
@@ -285,7 +285,7 @@ test_scm_timestampns(struct msghdr *const mh, void *const page)
 
        cmsg->cmsg_len = CMSG_LEN(sizeof(struct timespec) - sizeof(long));
        cmsg->cmsg_level = SOL_SOCKET;
-       cmsg->cmsg_type = SO_TIMESTAMPNS;
+       cmsg->cmsg_type = SO_TIMESTAMPNS_OLD;
 
        mh->msg_control = cmsg;
        mh->msg_controllen = len;
@@ -293,7 +293,7 @@ test_scm_timestampns(struct msghdr *const mh, void *const page)
        rc = sendmsg(-1, mh, 0);
        printf("sendmsg(-1, {msg_name=NULL, msg_namelen=0, msg_iov=NULL"
               ", msg_iovlen=0, msg_control=[{cmsg_len=%u"
-              ", cmsg_level=SOL_SOCKET, cmsg_type=SO_TIMESTAMPNS"
+              ", cmsg_level=SOL_SOCKET, cmsg_type=SO_TIMESTAMPNS_OLD"
               ", cmsg_data=?}]"
               ", msg_controllen=%lu, msg_flags=0}, 0) = %d %s (%m)\n",
               (unsigned) cmsg->cmsg_len,
@@ -308,7 +308,7 @@ test_scm_timestamping(struct msghdr *const mh, void *const page)
 
        cmsg->cmsg_len = CMSG_LEN(3 * sizeof(struct timespec));
        cmsg->cmsg_level = SOL_SOCKET;
-       cmsg->cmsg_type = SO_TIMESTAMPING;
+       cmsg->cmsg_type = SO_TIMESTAMPING_OLD;
        struct timespec *ts = (struct timespec *) CMSG_DATA(cmsg);
        ts[0].tv_sec = 123456789;
        ts[0].tv_nsec = 987654321;
@@ -323,7 +323,7 @@ test_scm_timestamping(struct msghdr *const mh, void *const page)
        int rc = sendmsg(-1, mh, 0);
        printf("sendmsg(-1, {msg_name=NULL, msg_namelen=0, msg_iov=NULL"
               ", msg_iovlen=0, msg_control=[{cmsg_len=%u"
-              ", cmsg_level=SOL_SOCKET, cmsg_type=SO_TIMESTAMPING"
+              ", cmsg_level=SOL_SOCKET, cmsg_type=SO_TIMESTAMPING_OLD"
               ", cmsg_data=[{tv_sec=%lld, tv_nsec=%llu}"
               ", {tv_sec=%lld, tv_nsec=%llu}, {tv_sec=%lld, tv_nsec=%llu}]}]"
               ", msg_controllen=%lu, msg_flags=0}, 0) = %d %s (%m)\n",
@@ -340,7 +340,7 @@ test_scm_timestamping(struct msghdr *const mh, void *const page)
 
        cmsg->cmsg_len = CMSG_LEN(3 * sizeof(struct timespec) - sizeof(long));
        cmsg->cmsg_level = SOL_SOCKET;
-       cmsg->cmsg_type = SO_TIMESTAMPING;
+       cmsg->cmsg_type = SO_TIMESTAMPING_OLD;
 
        mh->msg_control = cmsg;
        mh->msg_controllen = len;
@@ -348,7 +348,7 @@ test_scm_timestamping(struct msghdr *const mh, void *const page)
        rc = sendmsg(-1, mh, 0);
        printf("sendmsg(-1, {msg_name=NULL, msg_namelen=0, msg_iov=NULL"
               ", msg_iovlen=0, msg_control=[{cmsg_len=%u"
-              ", cmsg_level=SOL_SOCKET, cmsg_type=SO_TIMESTAMPING"
+              ", cmsg_level=SOL_SOCKET, cmsg_type=SO_TIMESTAMPING_OLD"
               ", cmsg_data=?}]"
               ", msg_controllen=%lu, msg_flags=0}, 0) = %d %s (%m)\n",
               (unsigned) cmsg->cmsg_len,

diff --git a/tests/sockopt-timestamp.c b/tests/sockopt-timestamp.c
index e9f3b0d5705bab46e8408900f5b8c6fe0b149c32..d6f6ccf9b6a3935a629fca2f65d422f9239ed39c 100644 (file)
--- a/tests/sockopt-timestamp.c
+++ b/tests/sockopt-timestamp.c
@@ -140,9 +140,9 @@ main(void)
                const char *str;
                void (*fun)(const struct cmsghdr *);
        } tests[] = {
-               { SO_TIMESTAMP_OLD, "SO_TIMESTAMP", print_timestamp_old },
+               { SO_TIMESTAMP_OLD, "SO_TIMESTAMP_OLD", print_timestamp_old },
 #ifdef SO_TIMESTAMPNS_OLD
-               { SO_TIMESTAMPNS_OLD, "SO_TIMESTAMPNS", print_timestampns_old },
+               { SO_TIMESTAMPNS_OLD, "SO_TIMESTAMPNS_OLD", print_timestampns_old },
 #endif
        };
        unsigned int tested = 0;

diff --git a/xlat/scmvals.in b/xlat/scmvals.in
index 2a070c14deb7e177ade78419435ee19ea2b97040..ebd5e14fb539aed5f479d6aa27b994a713a89241 100644 (file)
--- a/xlat/scmvals.in
+++ b/xlat/scmvals.in
@@ -4,9 +4,9 @@ SCM_SECURITY    3
 
 SO_WIFI_STATUS
 SO_TXTIME
-SO_TIMESTAMP
-SO_TIMESTAMPNS
-SO_TIMESTAMPING
+SO_TIMESTAMP_OLD
+SO_TIMESTAMPNS_OLD
+SO_TIMESTAMPING_OLD
 
 /* Generated by maint/gen_xlat_defs.sh -f '#x' -p 'SCM_TIMESTAMPING_' -c 'asm-generic/socket.h' -a 'asm/socket.h' */
 #if defined __sparc__

diff --git a/xlat/sock_options.in b/xlat/sock_options.in
index 9f96d2d53229bfaef3ff4e47abdcb506bf15cc8a..51b8157aae88080870419d76ecbd7714b9867e6e 100644 (file)
--- a/xlat/sock_options.in
+++ b/xlat/sock_options.in
@@ -211,9 +211,9 @@ SO_PEERNAME 28
 #endif
 
 #if defined __hppa__
-SO_TIMESTAMP   16402
+SO_TIMESTAMP_OLD       16402
 #else
-SO_TIMESTAMP   29
+SO_TIMESTAMP_OLD       29
 #endif
 
 #if defined __mips__
@@ -259,11 +259,11 @@ SO_PASSSEC        34
 #endif
 
 #if defined __sparc__
-SO_TIMESTAMPNS 33
+SO_TIMESTAMPNS_OLD     33
 #elif defined __hppa__
-SO_TIMESTAMPNS 16403
+SO_TIMESTAMPNS_OLD     16403
 #else
-SO_TIMESTAMPNS 35
+SO_TIMESTAMPNS_OLD     35
 #endif
 
 #if defined __sparc__
@@ -275,11 +275,11 @@ SO_MARK   36
 #endif
 
 #if defined __sparc__
-SO_TIMESTAMPING        35
+SO_TIMESTAMPING_OLD    35
 #elif defined __hppa__
-SO_TIMESTAMPING        16416
+SO_TIMESTAMPING_OLD    16416
 #else
-SO_TIMESTAMPING        37
+SO_TIMESTAMPING_OLD    37
 #endif
 
 #if defined __alpha__ || defined __hppa__ || defined __mips__ || defined __sparc__

diff --git a/xlat/sock_rds_options.in b/xlat/sock_rds_options.in
index 776d64a79636c209837ad3df147afa95c6e08f92..041261c285c293c10ad423a5b39b0519c46c9b74 100644 (file)
--- a/xlat/sock_rds_options.in
+++ b/xlat/sock_rds_options.in
@@ -9,7 +9,7 @@ SO_RDS_TRANSPORT        8
 SO_RDS_MSG_RXPATH_LATENCY      10
 
 #ifndef __hppa__
-SO_TIMESTAMP           29
+SO_TIMESTAMP_OLD               29
 #endif
 
 RDS_INFO_COUNTERS              10000
@@ -25,5 +25,5 @@ RDS_INFO_CONNECTION_STATS     10009
 RDS_INFO_IWARP_CONNECTIONS     10010
 
 #ifdef __hppa__
-SO_TIMESTAMP           0x4012
+SO_TIMESTAMP_OLD               0x4012
 #endif