Commit 0309f98f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

y2038: socket: remove timespec reference in timestamping 



In order to remove the 'struct timespec' definition and the
timespec64_to_timespec() helper function, change over the in-kernel
definition of 'struct scm_timestamping' to use the __kernel_old_timespec
replacement and open-code the assignment.

Acked-by: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 75d319c0

include/uapi/linux/errqueue.h

+7 −0
Original line number Diff line number Diff line
@@ -37,9 +37,16 @@ struct sock_extended_err { 
 *	The timestamping interfaces SO_TIMESTAMPING, MSG_TSTAMP_*

 *	communicate network timestamps by passing this struct in a cmsg with

 *	recvmsg(). See Documentation/networking/timestamping.txt for details.

 *	User space sees a timespec definition that matches either

 *	__kernel_timespec or __kernel_old_timespec, in the kernel we

 *	require two structure definitions to provide both.

 */

struct scm_timestamping {

#ifdef __KERNEL__

	struct __kernel_old_timespec ts[3];

#else

	struct timespec ts[3];

#endif

};



struct scm_timestamping64 {

net/core/scm.c

+4 −2
Original line number Diff line number Diff line
@@ -268,8 +268,10 @@ void put_cmsg_scm_timestamping(struct msghdr *msg, struct scm_timestamping_inter 
	struct scm_timestamping tss;

	int i;



	for (i = 0; i < ARRAY_SIZE(tss.ts); i++)

		tss.ts[i] = timespec64_to_timespec(tss_internal->ts[i]);

	for (i = 0; i < ARRAY_SIZE(tss.ts); i++) {

		tss.ts[i].tv_sec = tss_internal->ts[i].tv_sec;

		tss.ts[i].tv_nsec = tss_internal->ts[i].tv_nsec;

	}



	put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMPING_OLD, sizeof(tss), &tss);

}