Module Name: src
Committed By: maxv
Date: Thu Dec 27 16:59:17 UTC 2018
Modified Files:
src/sys/netinet: tcp_output.c tcp_subr.c tcp_var.h udp_usrreq.c
src/sys/netinet6: udp6_usrreq.c
Log Message:
Remove unused arguments.
To generate a diff of this commit:
cvs rdiff -u -r1.209 -r1.210 src/sys/netinet/tcp_output.c
cvs rdiff -u -r1.281 -r1.282 src/sys/netinet/tcp_subr.c
cvs rdiff -u -r1.189 -r1.190 src/sys/netinet/tcp_var.h
cvs rdiff -u -r1.257 -r1.258 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.144 -r1.145 src/sys/netinet6/udp6_usrreq.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/netinet/tcp_output.c
diff -u src/sys/netinet/tcp_output.c:1.209 src/sys/netinet/tcp_output.c:1.210
--- src/sys/netinet/tcp_output.c:1.209 Mon Sep 3 16:29:36 2018
+++ src/sys/netinet/tcp_output.c Thu Dec 27 16:59:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_output.c,v 1.209 2018/09/03 16:29:36 riastradh Exp $ */
+/* $NetBSD: tcp_output.c,v 1.210 2018/12/27 16:59:17 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -135,7 +135,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.209 2018/09/03 16:29:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.210 2018/12/27 16:59:17 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1656,10 +1656,10 @@ out:
if (error == ENOBUFS) {
TCP_STATINC(TCP_STAT_SELFQUENCH);
if (tp->t_inpcb)
- tcp_quench(tp->t_inpcb, 0);
+ tcp_quench(tp->t_inpcb);
#ifdef INET6
if (tp->t_in6pcb)
- tcp6_quench(tp->t_in6pcb, 0);
+ tcp6_quench(tp->t_in6pcb);
#endif
error = 0;
} else if ((error == EHOSTUNREACH || error == ENETDOWN) &&
Index: src/sys/netinet/tcp_subr.c
diff -u src/sys/netinet/tcp_subr.c:1.281 src/sys/netinet/tcp_subr.c:1.282
--- src/sys/netinet/tcp_subr.c:1.281 Mon Sep 3 16:29:36 2018
+++ src/sys/netinet/tcp_subr.c Thu Dec 27 16:59:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_subr.c,v 1.281 2018/09/03 16:29:36 riastradh Exp $ */
+/* $NetBSD: tcp_subr.c,v 1.282 2018/12/27 16:59:17 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.281 2018/09/03 16:29:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.282 2018/12/27 16:59:17 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1631,7 +1631,7 @@ tcp_ctlinput(int cmd, const struct socka
* We will gradually open it again as we proceed.
*/
void
-tcp_quench(struct inpcb *inp, int errno)
+tcp_quench(struct inpcb *inp)
{
struct tcpcb *tp = intotcpcb(inp);
@@ -1643,7 +1643,7 @@ tcp_quench(struct inpcb *inp, int errno)
#ifdef INET6
void
-tcp6_quench(struct in6pcb *in6p, int errno)
+tcp6_quench(struct in6pcb *in6p)
{
struct tcpcb *tp = in6totcpcb(in6p);
Index: src/sys/netinet/tcp_var.h
diff -u src/sys/netinet/tcp_var.h:1.189 src/sys/netinet/tcp_var.h:1.190
--- src/sys/netinet/tcp_var.h:1.189 Fri Sep 14 05:09:51 2018
+++ src/sys/netinet/tcp_var.h Thu Dec 27 16:59:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_var.h,v 1.189 2018/09/14 05:09:51 maxv Exp $ */
+/* $NetBSD: tcp_var.h,v 1.190 2018/12/27 16:59:17 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -891,9 +891,9 @@ u_int tcp_optlen(struct tcpcb *);
int tcp_output(struct tcpcb *);
void tcp_pulloutofband(struct socket *,
struct tcphdr *, struct mbuf *, int);
-void tcp_quench(struct inpcb *, int);
+void tcp_quench(struct inpcb *);
#ifdef INET6
-void tcp6_quench(struct in6pcb *, int);
+void tcp6_quench(struct in6pcb *);
#endif
void tcp_mtudisc(struct inpcb *, int);
#ifdef INET6
Index: src/sys/netinet/udp_usrreq.c
diff -u src/sys/netinet/udp_usrreq.c:1.257 src/sys/netinet/udp_usrreq.c:1.258
--- src/sys/netinet/udp_usrreq.c:1.257 Thu Nov 22 04:48:34 2018
+++ src/sys/netinet/udp_usrreq.c Thu Dec 27 16:59:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: udp_usrreq.c,v 1.257 2018/11/22 04:48:34 knakahara Exp $ */
+/* $NetBSD: udp_usrreq.c,v 1.258 2018/12/27 16:59:17 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.257 2018/11/22 04:48:34 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.258 2018/12/27 16:59:17 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -127,7 +127,7 @@ percpu_t *udpstat_percpu;
#ifdef INET
#ifdef IPSEC
-static int udp4_espinudp(struct mbuf **, int, struct socket *);
+static int udp4_espinudp(struct mbuf **, int);
#endif
static void udp4_sendup(struct mbuf *, int, struct sockaddr *,
struct socket *);
@@ -577,7 +577,7 @@ udp4_realinput(struct sockaddr_in *src,
#ifdef IPSEC
/* Handle ESP over UDP */
if (inp->inp_flags & INP_ESPINUDP) {
- switch (udp4_espinudp(mp, off, inp->inp_socket)) {
+ switch (udp4_espinudp(mp, off)) {
case -1: /* Error, m was freed */
rcvcnt = -1;
goto bad;
@@ -1223,7 +1223,7 @@ udp_statinc(u_int stat)
* -1 if an error occurred and m was freed
*/
static int
-udp4_espinudp(struct mbuf **mp, int off, struct socket *so)
+udp4_espinudp(struct mbuf **mp, int off)
{
const size_t skip = sizeof(struct udphdr);
size_t len;
Index: src/sys/netinet6/udp6_usrreq.c
diff -u src/sys/netinet6/udp6_usrreq.c:1.144 src/sys/netinet6/udp6_usrreq.c:1.145
--- src/sys/netinet6/udp6_usrreq.c:1.144 Thu Nov 22 04:48:34 2018
+++ src/sys/netinet6/udp6_usrreq.c Thu Dec 27 16:59:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: udp6_usrreq.c,v 1.144 2018/11/22 04:48:34 knakahara Exp $ */
+/* $NetBSD: udp6_usrreq.c,v 1.145 2018/12/27 16:59:17 maxv Exp $ */
/* $KAME: udp6_usrreq.c,v 1.86 2001/05/27 17:33:00 itojun Exp $ */
/* $KAME: udp6_output.c,v 1.43 2001/10/15 09:19:52 itojun Exp $ */
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.144 2018/11/22 04:48:34 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.145 2018/12/27 16:59:17 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -137,8 +137,7 @@ static int udp6_recvspace = 40 * (1024 +
static void udp6_notify(struct in6pcb *, int);
static void sysctl_net_inet6_udp6_setup(struct sysctllog **);
#ifdef IPSEC
-static int udp6_espinudp(struct mbuf **, int, struct sockaddr *,
- struct socket *);
+static int udp6_espinudp(struct mbuf **, int);
#endif
#ifdef UDP_CSUM_COUNTERS
@@ -527,9 +526,7 @@ udp6_realinput(int af, struct sockaddr_i
#ifdef IPSEC
/* Handle ESP over UDP */
if (in6p->in6p_flags & IN6P_ESPINUDP) {
- struct sockaddr *sa = (struct sockaddr *)src;
-
- switch (udp6_espinudp(mp, off, sa, in6p->in6p_socket)) {
+ switch (udp6_espinudp(mp, off)) {
case -1: /* Error, m was freed */
rcvcnt = -1;
goto bad;
@@ -1385,8 +1382,7 @@ udp6_statinc(u_int stat)
* -1 if an error occurred and m was freed
*/
static int
-udp6_espinudp(struct mbuf **mp, int off, struct sockaddr *src,
- struct socket *so)
+udp6_espinudp(struct mbuf **mp, int off)
{
const size_t skip = sizeof(struct udphdr);
size_t len;
