diff options
| author |   visa <visa@openbsd.org> | 2021-01-28 14:53:20 +0000 |
|---|---|---|
| committer | visa <visa@openbsd.org> | 2021-01-28 14:53:20 +0000 |
| commit | ed4744ab1e61dd54f3f4dfa01a39bbe100b1b816 (patch) | |
| tree | 3be6e713d9f609de0d2172c06932e880a5fac662 | |
| parent | Be consistent in not using parameter names for function prototypes; (diff) | |
| download | wireguard-openbsd-ed4744ab1e61dd54f3f4dfa01a39bbe100b1b816.tar.xz wireguard-openbsd-ed4744ab1e61dd54f3f4dfa01a39bbe100b1b816.zip | |
Drop tcp_trace() from SMALL_KERNEL builds to make room on amd64 floppy
OK deraadt@
| -rw-r--r-- | sys/conf/files | 4 | ||||
| -rw-r--r-- | sys/netinet/tcp_var.h | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/sys/conf/files b/sys/conf/files index 2d7c946c5db..ff84e575ae9 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.692 2020/11/17 14:30:13 patrick Exp $ +# $OpenBSD: files,v 1.693 2021/01/28 14:53:20 visa Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -872,7 +872,7 @@ file netinet/ip_input.c file netinet/ip_mroute.c mrouting file netinet/ip_output.c file netinet/raw_ip.c -file netinet/tcp_debug.c +file netinet/tcp_debug.c !small_kernel file netinet/tcp_input.c file netinet/tcp_output.c file netinet/tcp_subr.c diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 1aeca60f2a3..5783f1fb8ab 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_var.h,v 1.135 2020/08/18 05:21:21 gnezdo Exp $ */ +/* $OpenBSD: tcp_var.h,v 1.136 2021/01/28 14:53:20 visa Exp $ */ /* $NetBSD: tcp_var.h,v 1.17 1996/02/13 23:44:24 christos Exp $ */ /* @@ -694,8 +694,10 @@ void tcp_update_rcvspace(struct tcpcb *); void tcp_slowtimo(void); struct mbuf * tcp_template(struct tcpcb *); +#ifndef SMALL_KERNEL void tcp_trace(short, short, struct tcpcb *, struct tcpcb *, caddr_t, int, int); +#endif struct tcpcb * tcp_usrclosed(struct tcpcb *); int tcp_sysctl(int *, u_int, void *, size_t *, void *, size_t); @@ -728,5 +730,13 @@ void syn_cache_unreach(struct sockaddr *, struct sockaddr *, void syn_cache_init(void); void syn_cache_cleanup(struct tcpcb *); +#ifdef SMALL_KERNEL +static inline void +tcp_trace(short act, short ostate, struct tcpcb *tp, struct tcpcb *otp, + caddr_t headers, int req, int len) +{ +} +#endif + #endif /* _KERNEL */ #endif /* _NETINET_TCP_VAR_H_ */ |