Module Name: src
Committed By: maxv
Date: Wed Mar 28 14:22:16 UTC 2018
Modified Files:
src/sys/netinet: tcp_input.c tcp_var.h
Log Message:
Remove two unused args from syn_cache_get().
To generate a diff of this commit:
cvs rdiff -u -r1.390 -r1.391 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.184 -r1.185 src/sys/netinet/tcp_var.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/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.390 src/sys/netinet/tcp_input.c:1.391
--- src/sys/netinet/tcp_input.c:1.390 Wed Mar 28 14:16:59 2018
+++ src/sys/netinet/tcp_input.c Wed Mar 28 14:22:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_input.c,v 1.390 2018/03/28 14:16:59 maxv Exp $ */
+/* $NetBSD: tcp_input.c,v 1.391 2018/03/28 14:22:16 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.390 2018/03/28 14:16:59 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.391 2018/03/28 14:22:16 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1635,8 +1635,7 @@ nosave:;
*/
goto badsyn;
} else if (tiflags & TH_ACK) {
- so = syn_cache_get(&src.sa, &dst.sa,
- th, toff, tlen, so, m);
+ so = syn_cache_get(&src.sa, &dst.sa, th, so, m);
if (so == NULL) {
/*
* We don't have a SYN for this ACK;
@@ -3788,8 +3787,7 @@ syn_cache_lookup(const struct sockaddr *
*/
struct socket *
syn_cache_get(struct sockaddr *src, struct sockaddr *dst,
- struct tcphdr *th, unsigned int hlen, unsigned int tlen,
- struct socket *so, struct mbuf *m)
+ struct tcphdr *th, struct socket *so, struct mbuf *m)
{
struct syn_cache *sc;
struct syn_cache_head *scp;
Index: src/sys/netinet/tcp_var.h
diff -u src/sys/netinet/tcp_var.h:1.184 src/sys/netinet/tcp_var.h:1.185
--- src/sys/netinet/tcp_var.h:1.184 Mon Feb 12 08:22:26 2018
+++ src/sys/netinet/tcp_var.h Wed Mar 28 14:22:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_var.h,v 1.184 2018/02/12 08:22:26 maxv Exp $ */
+/* $NetBSD: tcp_var.h,v 1.185 2018/03/28 14:22:16 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -960,8 +960,7 @@ int syn_cache_add(struct sockaddr *, st
void syn_cache_unreach(const struct sockaddr *, const struct sockaddr *,
struct tcphdr *);
struct socket *syn_cache_get(struct sockaddr *, struct sockaddr *,
- struct tcphdr *, unsigned int, unsigned int,
- struct socket *so, struct mbuf *);
+ struct tcphdr *, struct socket *so, struct mbuf *);
void syn_cache_init(void);
void syn_cache_insert(struct syn_cache *, struct tcpcb *);
struct syn_cache *syn_cache_lookup(const struct sockaddr *, const struct sockaddr *,
