Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.211.2.5
retrieving revision 1.255
diff -u -p -r1.211.2.5 -r1.255
--- src/sys/kern/uipc_socket.c	2017/12/03 11:38:45	1.211.2.5
+++ src/sys/kern/uipc_socket.c	2017/05/27 21:02:56	1.255
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.211.2.5 2017/12/03 11:38:45 jdolecek Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.255 2017/05/27 21:02:56 bouyer 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.211.2.5 2017/12/03 11:38:45 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.255 2017/05/27 21:02:56 bouyer Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -2319,26 +2319,12 @@ filt_solisten(struct knote *kn, long hin
 	return rv;
 }
 
-static const struct filterops solisten_filtops = {
-	.f_isfd = 1,
-	.f_attach = NULL,
-	.f_detach = filt_sordetach,
-	.f_event = filt_solisten,
-};
-
-static const struct filterops soread_filtops = {
-	.f_isfd = 1,
-	.f_attach = NULL,
-	.f_detach = filt_sordetach,
-	.f_event = filt_soread,
-};
-
-static const struct filterops sowrite_filtops = {
-	.f_isfd = 1,
-	.f_attach = NULL,
-	.f_detach = filt_sowdetach,
-	.f_event = filt_sowrite,
-};
+static const struct filterops solisten_filtops =
+	{ 1, NULL, filt_sordetach, filt_solisten };
+static const struct filterops soread_filtops =
+	{ 1, NULL, filt_sordetach, filt_soread };
+static const struct filterops sowrite_filtops =
+	{ 1, NULL, filt_sowdetach, filt_sowrite };
 
 int
 soo_kqfilter(struct file *fp, struct knote *kn)
@@ -2424,33 +2410,6 @@ 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>