Module Name: src
Committed By: maxv
Date: Thu Apr 26 19:22:17 UTC 2018
Modified Files:
src/sys/kern: uipc_socket.c
src/sys/netinet: ip_input.c
src/sys/netinet6: ip6_input.c
src/sys/sys: socketvar.h
Log Message:
Remove unused mbuf argument from sbsavetimestamp.
To generate a diff of this commit:
cvs rdiff -u -r1.261 -r1.262 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.380 -r1.381 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.199 -r1.200 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.152 -r1.153 src/sys/sys/socketvar.h
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.261 src/sys/kern/uipc_socket.c:1.262
--- src/sys/kern/uipc_socket.c:1.261 Mon Mar 19 16:32:30 2018
+++ src/sys/kern/uipc_socket.c Thu Apr 26 19:22:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.261 2018/03/19 16:32:30 roy Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.262 2018/04/26 19:22:17 maxv 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.261 2018/03/19 16:32:30 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.262 2018/04/26 19:22:17 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -2431,7 +2431,7 @@ sopoll(struct socket *so, int events)
}
struct mbuf **
-sbsavetimestamp(int opt, struct mbuf *m, struct mbuf **mp)
+sbsavetimestamp(int opt, struct mbuf **mp)
{
struct timeval tv;
microtime(&tv);
Index: src/sys/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.380 src/sys/netinet/ip_input.c:1.381
--- src/sys/netinet/ip_input.c:1.380 Sun Apr 15 07:35:49 2018
+++ src/sys/netinet/ip_input.c Thu Apr 26 19:22:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_input.c,v 1.380 2018/04/15 07:35:49 maxv Exp $ */
+/* $NetBSD: ip_input.c,v 1.381 2018/04/26 19:22:17 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.380 2018/04/15 07:35:49 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.381 2018/04/26 19:22:17 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1497,7 +1497,7 @@ ip_savecontrol(struct inpcb *inp, struct
int inpflags = inp->inp_flags;
if (SOOPT_TIMESTAMP(so->so_options))
- mp = sbsavetimestamp(so->so_options, m, mp);
+ mp = sbsavetimestamp(so->so_options, mp);
if (inpflags & INP_RECVDSTADDR) {
*mp = sbcreatecontrol(&ip->ip_dst,
Index: src/sys/netinet6/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.199 src/sys/netinet6/ip6_input.c:1.200
--- src/sys/netinet6/ip6_input.c:1.199 Thu Apr 26 07:01:38 2018
+++ src/sys/netinet6/ip6_input.c Thu Apr 26 19:22:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_input.c,v 1.199 2018/04/26 07:01:38 maxv Exp $ */
+/* $NetBSD: ip6_input.c,v 1.200 2018/04/26 19:22:17 maxv Exp $ */
/* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.199 2018/04/26 07:01:38 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.200 2018/04/26 19:22:17 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -1074,7 +1074,7 @@ ip6_savecontrol(struct in6pcb *in6p, str
#endif
if (SOOPT_TIMESTAMP(so->so_options))
- mp = sbsavetimestamp(so->so_options, m, mp);
+ mp = sbsavetimestamp(so->so_options, mp);
/* some OSes call this logic with IPv4 packet, for SO_TIMESTAMP */
if ((ip6->ip6_vfc & IPV6_VERSION_MASK) != IPV6_VERSION)
Index: src/sys/sys/socketvar.h
diff -u src/sys/sys/socketvar.h:1.152 src/sys/sys/socketvar.h:1.153
--- src/sys/sys/socketvar.h:1.152 Thu Apr 19 21:19:07 2018
+++ src/sys/sys/socketvar.h Thu Apr 26 19:22:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: socketvar.h,v 1.152 2018/04/19 21:19:07 christos Exp $ */
+/* $NetBSD: socketvar.h,v 1.153 2018/04/26 19:22:17 maxv Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -283,7 +283,7 @@ struct mbuf *
struct mbuf *
sbcreatecontrol1(void **, int, int, int, int);
struct mbuf **
- sbsavetimestamp(int, struct mbuf *, struct mbuf **);
+ sbsavetimestamp(int, struct mbuf **);
void sbdrop(struct sockbuf *, int);
void sbdroprecord(struct sockbuf *);
void sbflush(struct sockbuf *);
