diff options
| author |   bluhm <bluhm@openbsd.org> | 2017-01-25 17:34:31 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2017-01-25 17:34:31 +0000 |
| commit | 8f50be26efbcb88c43579636cc560843a6399860 (patch) | |
| tree | 55e20c33e2edb3cdc3ffc08498a0ce51a576af58 /sys/netinet/tcp_input.c | |
| parent | Fix array initialization syntax for ocspcheck.c (diff) | |
| download | wireguard-openbsd-8f50be26efbcb88c43579636cc560843a6399860.tar.xz wireguard-openbsd-8f50be26efbcb88c43579636cc560843a6399860.zip | |
Since raw_input() and route_input() are gone from pr_input, we can
make the variable parameters of the protocol input functions fixed.
Also add the proto to make it similar to IPv6.
OK mpi@ guenther@ millert@
Diffstat (limited to 'sys/netinet/tcp_input.c')
| -rw-r--r-- | sys/netinet/tcp_input.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 610a7ca165f..c16afb14e3b 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_input.c,v 1.335 2017/01/10 09:01:18 mpi Exp $ */ +/* $OpenBSD: tcp_input.c,v 1.336 2017/01/25 17:34:31 bluhm Exp $ */ /* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */ /* @@ -367,7 +367,7 @@ tcp6_input(struct mbuf **mp, int *offp, int proto) * protocol specification dated September, 1981 very closely. */ void -tcp_input(struct mbuf *m, ...) +tcp_input(struct mbuf *m, int iphlen, int proto) { struct ip *ip; struct inpcb *inp = NULL; @@ -383,8 +383,6 @@ tcp_input(struct mbuf *m, ...) tcp_seq iss, *reuse = NULL; u_long tiwin; struct tcp_opt_info opti; - int iphlen; - va_list ap; struct tcphdr *th; #ifdef INET6 struct ip6_hdr *ip6 = NULL; @@ -400,10 +398,6 @@ tcp_input(struct mbuf *m, ...) u_char iptos; #endif - va_start(ap, m); - iphlen = va_arg(ap, int); - va_end(ap); - tcpstat.tcps_rcvtotal++; opti.ts_present = 0; |