Module Name: src Committed By: christos Date: Thu Jul 6 17:42:39 UTC 2017
Modified Files: src/sys/kern: uipc_socket.c uipc_socket2.c Log Message: move the timestamp stuff to uipc_socket.c because it already has the compat includes. To generate a diff of this commit: cvs rdiff -u -r1.255 -r1.256 src/sys/kern/uipc_socket.c cvs rdiff -u -r1.125 -r1.126 src/sys/kern/uipc_socket2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/kern/uipc_socket.c diff -u src/sys/kern/uipc_socket.c:1.255 src/sys/kern/uipc_socket.c:1.256 --- src/sys/kern/uipc_socket.c:1.255 Sat May 27 17:02:56 2017 +++ src/sys/kern/uipc_socket.c Thu Jul 6 13:42:39 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.255 2017/05/27 21:02:56 bouyer Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.256 2017/07/06 17:42:39 christos Exp $ */ /*- * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.255 2017/05/27 21:02:56 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.256 2017/07/06 17:42:39 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -2410,6 +2410,33 @@ sopoll(struct socket *so, int events) return revents; } +struct mbuf ** +sbsavetimestamp(int opt, struct mbuf *m, struct mbuf **mp) +{ + struct timeval tv; + microtime(&tv); + +#ifdef SO_OTIMESTAMP + if (opt & SO_OTIMESTAMP) { + struct timeval50 tv50; + + timeval_to_timeval50(&tv, &tv50); + *mp = sbcreatecontrol(&tv50, sizeof(tv50), + SCM_OTIMESTAMP, SOL_SOCKET); + if (*mp) + mp = &(*mp)->m_next; + } else +#endif + + if (opt & SO_TIMESTAMP) { + *mp = sbcreatecontrol(&tv, sizeof(tv), + SCM_TIMESTAMP, SOL_SOCKET); + if (*mp) + mp = &(*mp)->m_next; + } + return mp; +} + #include <sys/sysctl.h> Index: src/sys/kern/uipc_socket2.c diff -u src/sys/kern/uipc_socket2.c:1.125 src/sys/kern/uipc_socket2.c:1.126 --- src/sys/kern/uipc_socket2.c:1.125 Thu Jul 6 13:08:57 2017 +++ src/sys/kern/uipc_socket2.c Thu Jul 6 13:42:39 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket2.c,v 1.125 2017/07/06 17:08:57 christos Exp $ */ +/* $NetBSD: uipc_socket2.c,v 1.126 2017/07/06 17:42:39 christos Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -58,12 +58,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.125 2017/07/06 17:08:57 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.126 2017/07/06 17:42:39 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_mbuftrace.h" #include "opt_sb_max.h" -#include "opt_compat_netbsd.h" #endif #include <sys/param.h> @@ -1528,35 +1527,3 @@ sowait(struct socket *so, bool catch_p, solockretry(so, lock); return error; } - -#ifdef COMPAT_50 -#include <compat/sys/time.h> -#include <compat/sys/socket.h> -#endif - -struct mbuf ** -sbsavetimestamp(int opt, struct mbuf *m, struct mbuf **mp) -{ - struct timeval tv; - microtime(&tv); - -#ifdef SO_OTIMESTAMP - if (opt & SO_OTIMESTAMP) { - struct timeval50 tv50; - - timeval_to_timeval50(&tv, &tv50); - *mp = sbcreatecontrol(&tv50, sizeof(tv50), - SCM_OTIMESTAMP, SOL_SOCKET); - if (*mp) - mp = &(*mp)->m_next; - } else -#endif - - if (opt & SO_TIMESTAMP) { - *mp = sbcreatecontrol(&tv, sizeof(tv), - SCM_TIMESTAMP, SOL_SOCKET); - if (*mp) - mp = &(*mp)->m_next; - } - return mp; -}